Comment by Nullabillity
5 months ago
Merge main into your branch, then merge --no-ff your branch into main. No need to rebase or squash anything.
5 months ago
Merge main into your branch, then merge --no-ff your branch into main. No need to rebase or squash anything.
> 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.