• andrew@lemmy.stuart.fun
    link
    fedilink
    English
    arrow-up
    0
    ·
    9 months ago

    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.