[larusso]

Isn’t that what GitHub does when the rebase strategy. Because when the rebase can’t be made cleanly GitHub still asks for conflict resolution.

[yxhuvud]

No. If you rebase you get no merge commit by default.

[larusso]

Ah yes. My bad. You explicitly want the empty merge commit.