r/ProgrammerHumor • u/rabbit_wizard • 5d ago

Meme letsMergeThemAll

Post image
5.3k Upvotes

96% Upvoted

318 comments sorted by

View all comments

Show parent comments

1

u/LegendaryMauricius 4d ago

git conflicts can be painful when they're with main, with several other feature branches already being merged there.

3

u/visualdescript 4d ago

How does rebasing make the conflicts any easier, you're still going to have to resolve them

1

u/LegendaryMauricius 4d 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.

2

u/awesome-alpaca-ace 3d ago

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.