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.

[–] Atemu@lemmy.ml 4 points 8 months ago (1 children)

The thing is, you can get your cake and eat it too. Rebase your feature branches while in development and then merge them to the main branch when they're done.

[–] jaemo@sh.itjust.works 1 points 8 months ago

👏 Super duper this is the way. No notes!