this post was submitted on 04 Apr 2024

1115 points (98.1% liked)

Programmer Humor

19623 readers

2 users here now

Welcome to Programmer Humor!

This is a place where you can post jokes, memes, humor, etc. related to programming!

For sharing awful code theres also Programming Horror.

Rules

Keep content in english
No advertisements
Posts must be related to programming or programmer topics

founded 1 year ago

MODERATORS

Feyter@programming.dev

anzo@programming.dev

BurningTurtle@programming.dev

pylapp@programming.dev

1115

Rebase Supremacy (programming.dev)

submitted 7 months ago by JPDev@programming.dev to c/programmer_humor@programming.dev

238 comments fedilink hide all child comments

you are viewing a single comment's thread
view the rest of the comments

[–] muad_dibber@lemmygrad.ml 4 points 7 months ago (1 children)

If you try to pull someone else's rebased / history rewritten branch, your git will tell you that it's rejected. You can completely avoid this by merging instead of rewriting history.

[–] Atemu@lemmy.ml 1 points 7 months ago

...or you simply rebase the subset of commits of your branch onto the rewritten branch. That's like 10 simple button presses in magit.