JPDev@programming.dev to Programmer Humor@programming.dev · 6 months agoRebase Supremacyprogramming.devimagemessage-square196fedilinkarrow-up1223arrow-down16
arrow-up1217arrow-down1imageRebase Supremacyprogramming.devJPDev@programming.dev to Programmer Humor@programming.dev · 6 months agomessage-square196fedilink
minus-squarepineapple_pizza@lemmy.dexlit.xyzlinkfedilinkarrow-up3·6 months agoThis diagram seems wrong to me. Isn’t the second image a squash merge? Also why would rebasing a feature branch change main?
minus-squareAtemu@lemmy.mllinkfedilinkarrow-up2·6 months agoThe only difference between a *rebase-merge and a rebase is whether main is reset to it or not. If you kept the main branch label on D and added a feature branch label on G’, that would be what @andrew@lemmy.stuart.fun meant.
This diagram seems wrong to me. Isn’t the second image a squash merge? Also why would rebasing a feature branch change main?
The only difference between a *rebase-merge and a rebase is whether main is reset to it or not. If you kept the main branch label on D and added a feature branch label on G’, that would be what @andrew@lemmy.stuart.fun meant.