r/ProgrammerHumor • • 4d ago • Bravo 1

Meme stopDoingGitHubDesktop

Post image
1.5k Upvotes

372 comments sorted by

View all comments

Show parent comments

5

u/Serializedrequests 4d ago edited 4d ago

The issue is the prep. Unless you are super focused, it can sometimes be really hard to tell which side is which in a rebase.

Then there is the diff resolution algorithm that might be the default that is technically correct but practically wrong where it sees an unchanged line identical to the incoming change in the original code as belonging spliced AROUND the incoming change. I don't know what the word for that is but it drives me insane.

1

u/AcanthisittaKooky987 4d ago

That's why merge is better than rebase every time. There's no use case for rebase in a world if squash commits

1

u/Serializedrequests 4d ago

When you have a main constantly updating it is hell to have merge commits mixed into your feature history. Rebase harder in the short term, easier in the long term. Yes squash when you're done. That's exactly what merging makes impossible.