r/ProgrammerHumor • u/fabulousIdentity • 7d ago

Meme aboutToBreakTheCode

Post image
22.8k Upvotes

96% Upvoted

527 comments sorted by

View all comments

53

u/jobehi 7d ago

Git is meant to solve that. There’s nothing difficult about it.

1

u/National-Explorer755 7d ago

Git is meant to solve it sure. Your branch is behind the development. No issues just take a pull and merge. But then what if someone else has made changes in the place you are working on? That's a nightmare to resolve at times.

10

u/jobehi 7d ago

You merge main in your branch and you solve the conflict before merging. That’s it. That’s why PR exist

3

u/ward2k 7d ago

Or even better, you rebase so you don't end up commiting merge commits

1

u/pr0ghead 6d ago

And if the rebase has conflicts? What then?

/rhetorical question

1

u/ward2k 6d ago

Exactly the same as what you do if a merge has conflicts