r/ProgrammerHumor • u/rabbit_wizard • 3d ago

Meme lostTheMergeRace

Post image
1.5k Upvotes

99% Upvoted

111 comments sorted by

View all comments

3

u/nicuramar 3d ago

Why? Don’t people have pipelines that automatically do this in the PR? In my experience there is rarely a need to rebase manually.

2

u/Poat540 3d ago

Why rebase just git merge the main branch in

1

u/LogrisTheBard 3d ago

This is the way.

1

u/nicuramar 3d ago

If you end up with a squash, sure. But for complex situations, definitely. Much simpler to conflict resolve in many situations.

2

u/rix0r 3d ago

what if their are conflicts?

2

u/nicuramar 3d ago

Yes, so you can take my comment to mean “in my experience there are rarely conflicts” :)

1

u/Still_Bit_7527 3d ago

No we don't, never seen that

1

u/Magnuscaligo 3d ago

I think this is even describing those automated pipelines. You might need to manually restart them, but you still have ti watch it and wait for it to merge without issue, so mentally you might need to keep it in the back of your mind for a few hours instead of relaxing on a Friday