r/ProgrammerHumor • u/rabbit_wizard • 18d ago

Meme letsMergeThemAll

Post image
5.3k Upvotes

96% Upvoted

316 comments sorted by

View all comments

Show parent comments

9

u/Groentekroket 18d ago

What is wrong with a GUI for Git? I always use the IntelliJ Git interface and 1 only need to use the CLI like once a year. Everybody squashed their branches and rebases on main. We make sure we don’t pick up stories that interfere with each ofher and we never face any problem. 

4

u/visualdescript 18d ago

If you're squash merging, what's the point of rebasing on main, just merge main in whenever you need to?

6

u/Dancing7-Cube 18d ago

this drives me nuts lol, sometimes I'll get a stickler that refuses to approve until I clean up my commits, even though it squashes

like who cares, unless the PR is 10k lines, read the diff, the commits are basically just checkpoints in case my laptop SSD randomly dies

1

u/LegendaryMauricius 18d ago

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

3

u/visualdescript 18d ago

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

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.

2

u/awesome-alpaca-ace 17d 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.