JPDev@programming.dev to Programmer Humor@programming.dev · 8 months agoRebase Supremacyprogramming.devimagemessage-square207fedilinkarrow-up11.11Karrow-down122
arrow-up11.09Karrow-down1imageRebase Supremacyprogramming.devJPDev@programming.dev to Programmer Humor@programming.dev · 8 months agomessage-square207fedilink
minus-squarepineapple_pizza@lemmy.dexlit.xyzlinkfedilinkarrow-up12·8 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-squareandrew@lemmy.stuart.funlinkfedilinkEnglisharrow-up3·8 months agoYeah, the image (not mine, but the best I found quickly) kinda shows a rebase+merge as the third image. As the other commenter mentioned, the new commit in the second image is the merge commit that would include any conflict resolutions.
minus-squarebort@sopuli.xyzlinkfedilinkarrow-up2·8 months ago why would rebasing a feature branch change main? the image does not update the feature branch. It merges the featurebranch into main with a regular old merge-commit on the main branch.
This diagram seems wrong to me. Isn’t the second image a squash merge? Also why would rebasing a feature branch change main?
Yeah, the image (not mine, but the best I found quickly) kinda shows a rebase+merge as the third image. As the other commenter mentioned, the new commit in the second image is the merge commit that would include any conflict resolutions.
the image does not update the feature branch. It merges the featurebranch into main with a regular old merge-commit on the main branch.