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

You're right, I'm not representing the merge correctly. I was thinking of having multiple merges because for a long running patch branch you might merge main into the patch branch several times before merging the patch branch into main.

I'm so used to rebasing I forgot there's tools that correctly show all the branching and merges and things.

Idk, I just like rebase's behavior over merge.

  • source
  • parent
  • hideshow 2 child comments