JPDev@programming.dev to Programmer Humor@programming.dev · 2 years agoRebase Supremacyprogramming.devimagemessage-square6linkfedilinkarrow-up10
arrow-up10imageRebase Supremacyprogramming.devJPDev@programming.dev to Programmer Humor@programming.dev · 2 years agomessage-square6linkfedilink
minus-squareJoYo@lemmy.mllinkfedilinkarrow-up0·2 years agoAnyone 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·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-up0·2 years agoDoesn’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?