Programmer Humor

19213 readers

1567 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

217

Rebase Supremacy (programming.dev)

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

196 comments fedilink hide all child comments

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

[–] 13@kbin.run 10 points 5 months ago (3 children)

Imagine rewring history

[–] wise_pancake@lemmy.ca 9 points 5 months ago

History is written by the squashers.

[–] magic_lobster_party@kbin.run 3 points 5 months ago (1 children)

Imagine working with a tangled spaghetti of history

[–] victorz@lemmy.world 4 points 5 months ago

You don't? Just follow the merges.

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

You try to pull someone's changes, but whoops, they used rebase and rewrote history! Delete the branch and start over.

[–] thesmokingman@programming.dev 2 points 5 months ago (1 children)

No you just do a rebase to bring it in. Assuming you’re making atomic commits you shouldn’t have a ton of merge conflicts. If you have to do this a lot, your branch scope is really bad and the problem isn’t in how you’re using got, it’s in how you’re slicing work.

[–] muad_dibber@lemmygrad.ml 0 points 5 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 5 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.