iScsc / iscsc.fr

The iScsc website, build with passion by wannabe devs 🔥
GNU General Public License v3.0
4 stars 12 forks source link

Merge main changes to `backend/python` #93

Closed ctmbl closed 1 year ago

ctmbl commented 1 year ago

one PR in particular needs to be in backend/python: it's the recent #92

amtoine commented 1 year ago

just to avoid a bad merge until we figure out how to do it :wink:

ctmbl commented 1 year ago

This will not do :+1: GH suggests to solve conflicts and push on main we don't want to do that We could solve it on backend then merge without conflicts but we would consciously destroy backend/python on one commit and this would never pass a potential CI so this is not what we want

instead I'll simply merge and solve properly on local then push it to backend/python this will be much more clean, if I do it without screwing up