Closed pylapp closed 4 months ago
Note: here in this case do not squash and merge because it will create two commits (one for squash and one for merge), and history wil be splitted again. Let's update our workflow with from feature branch to qualif branch using squash and merge, and from qualif branch to main with simple merge.
This workflow should be written in the documentation. FYI @ludovic35 your rollback did not succeeded in aligning the branches and getting a clean history (troubles at 0c98c4d8c3de08c1574409c4b72b258ab4675638)
✅ Deploy Preview for ods-ios canceled.