JPDev@programming.dev to Programmer Humor@programming.dev · vor 2 JahrenRebase Supremacyimagemessage-square10linkfedilinkarrow-up14arrow-down10
arrow-up14arrow-down1imageRebase SupremacyJPDev@programming.dev to Programmer Humor@programming.dev · vor 2 Jahrenmessage-square10linkfedilink
minus-squareJoYo@lemmy.mllinkfedilinkarrow-up0·vor 2 JahrenAnyone mind explaining to me how git rebase is worth the effort? git merge has it’s own issues but I just don’t see any benefit to rebase over it.
minus-squareAux@lemmy.worldlinkfedilinkarrow-up0·vor 2 JahrenWell, 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·vor 2 JahrenDoesn’t this defeat the purpose, may as well merge then no?
Anyone mind explaining to me how
git rebaseis worth the effort?git mergehas it’s own issues but I just don’t see any benefit to rebase over it.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?