JPDev@programming.dev to Programmer Humor@programming.dev · 1 year agoRebase Supremacyprogramming.devimagemessage-square230fedilinkarrow-up11.13K
arrow-up11.13KimageRebase Supremacyprogramming.devJPDev@programming.dev to Programmer Humor@programming.dev · 1 year agomessage-square230fedilink
minus-squareandrew@lemmy.stuart.funlinkfedilinkEnglisharrow-up3·1 year 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.