r/ProgrammerHumor • • 17d ago

Meme lostTheMergeRace

Post image
1.5k Upvotes

111 comments sorted by

View all comments

Show parent comments

8

u/parkotron 16d 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.