3 ms·
Merge main into your branch, then merge --no-ff your branch into main. No need to rebase or squash anything.
by Nullabillity 2y ago
Merge main into your branch, then merge --no-ff your branch into main. No need to rebase or squash anything.
- Izkata 2y ago> Merge main into your branch The same problem GP was trying to avoid is created here, the merge conflict resolution being on the merge commit.