You can require people to resolve merge conflicts locally by disabling the merge conflict editor on GitHub Enterprise for pull requests where the base branch and the head branch are in different repositories.

Requiring users to resolve merge conflicts locally on their computer can prevent people from inadvertently writing to an upstream repository from a fork.

  1. In the upper-right corner of any page, click . Rocketship icon for accessing site admin settings

  2. In the left sidebar, click Admin center. Admin Center tab

  3. Under "Conflict editor for pull requests between repositories", use the drop-down menu, and click Disabled. Drop-down menu with option to disable the merge conflict editor