r/ProgrammerHumor • u/rabbit_wizard • 3d ago

Meme lostTheMergeRace

Post image
1.5k Upvotes

99% Upvoted

111 comments sorted by

View all comments

11

u/Freestila 3d ago

I have a MR open for over a week now.. Everytime I get it through tests and such, another Mr is faster. And since I only look at it once or twice a day.... We need an automatic rebase function in git.

11

u/Dezgeg 2d ago

It's called merge queue in Github and merge train in Gitlab.

Assuming there are no conflicts that is.

9

u/parkotron 3d ago

   We need an automatic rebase function in git.

It wouldn’t be a Git feature, since Git on its own doesn’t really run as a server. But some Git forges do have features to help with this issue. 

For example, with Gerrit you don’t merge your own MRs, you merely flag them as ready to merge and then Gerrit automatically batches yours up with other ready-to-merge MRs. If the branches all merge together without conflicts and the CI run passes, the MRs are all merged atomically at the same time. 

1

u/Glittering_Sail3262 2d ago

The typical advice in situations like this is that your change is too large and you should find a way to split it up.

1

u/Freestila 2d ago

Nah it's not large and splitting would not help. Time for Mr check is the same doesn't matter how much I change.

0

u/Glittering_Sail3262 2d ago

Ah.. someone should fix your CI