3 ms·

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 5y ago
  No. If you rebase you get no merge commit by default.
  • larusso 5y ago
    Ah yes. My bad. You explicitly want the empty merge commit.