JPDev@programming.dev to Programmer Humor@programming.dev · 9 months agoRebase Supremacyprogramming.devimagemessage-square232fedilinkarrow-up11.13Karrow-down121
arrow-up11.11Karrow-down1imageRebase Supremacyprogramming.devJPDev@programming.dev to Programmer Humor@programming.dev · 9 months agomessage-square232fedilink
minus-squareandrew@lemmy.stuart.funlinkfedilinkEnglisharrow-up3·9 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.
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.