1114

Rebase Supremacy (programming.dev)

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

233 comments fedilink hide all child comments

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

[-] 13@kbin.run 66 points 7 months ago* (last edited 7 months ago)

Imagine rewring history

[-] muad_dibber@lemmygrad.ml 5 points 7 months ago

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

[-] thesmokingman@programming.dev 9 points 7 months ago

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 4 points 7 months ago

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.