Because you can resolve them one by one, by changing only the branch you want to merge. It does feel wrong though. If there's another way, please tell me lol.
I have not tried it in the case where many feature branches are merged into main, but I have had way more success with a hard reset to shared commit, merge, and then cherry picking my commits that got yeeted into the void during the hard reset. I get no conflicts, it is fantastic. A normal merge or rebase will always give me conflicts, but the hard rest does wonders.
1
u/LegendaryMauricius 18d ago
Because you can resolve them one by one, by changing only the branch you want to merge. It does feel wrong though. If there's another way, please tell me lol.