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

The only difference between a *rebase-merge and a rebase is whether main is reset to it or not. If you kept the main branch label on D and added a feature branch label on G', that would be what @andrew@lemmy.stuart.fun meant.

  • source
  • parent