JPDev@programming.dev to Programmer Humor@programming.dev · 9 months agoRebase Supremacyprogramming.devimagemessage-square238fedilinkarrow-up11.13Karrow-down122
arrow-up11.11Karrow-down1imageRebase Supremacyprogramming.devJPDev@programming.dev to Programmer Humor@programming.dev · 9 months agomessage-square238fedilink
minus-squareMuad'Dibber@lemmygrad.mllinkfedilinkarrow-up4·9 months agoIf 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.
minus-squareAtemu@lemmy.mllinkfedilinkarrow-up1·9 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.
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.
…or you simply rebase the subset of commits of your branch onto the rewritten branch. That’s like 10 simple button presses in magit.