3 ms·

GitHub projects can be configured to force fast-forward merges.

• alexchamberlain 3y ago
  I just re-checked github.com, and the only options are merge commit, squash commit and rebase commit. Rebase comes the closest, but none of these are fast-forward merges. Worst of all: you can't disable the green button if you don't like any of them.
  • mcpeepants 3y ago
    The "rebase" option combined with the branch protection rule of "require branch to be up-to-date" gets even closer, in my experience
    • jenadine 3y ago
      Rebase don't work if the branch you want to merge contains itself merges (that potentially fixes conflicts)