you are viewing a single comment's thread
view the rest of the comments
[–] 13 points 2 years ago (3 children)

This diagram seems wrong to me. Isn't the second image a squash merge? Also why would rebasing a feature branch change main?

  • source
  • parent
  • hideshow 3 child comments
  • [–] 3 points 2 years 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.

  • source
  • parent
  • [–] 2 points 2 years 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.

  • source
  • parent