JPDev@programming.dev to Programmer Humor@programming.dev · 2 years agoRebase Supremacyimagemessage-square10linkfedilinkarrow-up14arrow-down10
arrow-up14arrow-down1imageRebase SupremacyJPDev@programming.dev to Programmer Humor@programming.dev · 2 years agomessage-square10linkfedilink
minus-squareAux@lemmy.worldlinkfedilinkarrow-up0·2 years 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-up0arrow-down1·2 years agoDoesn’t this defeat the purpose, may as well merge then no?
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?