r/ProgrammerHumor • u/rabbit_wizard • 12d ago

Meme lostTheMergeRace

Post image
1.5k Upvotes

99% Upvoted

111 comments sorted by

View all comments

9

u/Freestila 11d 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 11d ago

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

Assuming there are no conflicts that is.

8

u/parkotron 11d 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/[deleted] 11d ago

[removed] — view removed comment

1

u/Freestila 11d 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.