JPDev@programming.dev to Programmer Humor@programming.dev · 8 months agoRebase Supremacyprogramming.devimagemessage-square211fedilinkarrow-up11arrow-down10
arrow-up11arrow-down1imageRebase Supremacyprogramming.devJPDev@programming.dev to Programmer Humor@programming.dev · 8 months agomessage-square211fedilink
minus-squareAux@lemmy.worldlinkfedilinkarrow-up0·8 months agoWell, rebase allows you to resolve the same conflict ten times in a row instead of doing it once. How cool is that?
minus-squarerapist1@lemmy.worldlinkfedilinkarrow-up0·8 months agoDoesn’t this defeat the purpose, may as well merge then no?
minus-squareexpr@programming.devlinkfedilinkarrow-up0·8 months agoNope, you just need to do it once: https://git-scm.com/book/en/v2/Git-Tools-Rerere.
Well, rebase allows you to resolve the same conflict ten times in a row instead of doing it once. How cool is that?
Squash your branch first
Doesn’t this defeat the purpose, may as well merge then no?
Nope, you just need to do it once: https://git-scm.com/book/en/v2/Git-Tools-Rerere.