Article version: Enterprise Server 2.20

Disabling the merge conflict editor for pull requests between repositories

You can require people to resolve merge conflicts locally by disabling the merge conflict editor on GitHub Enterprise Server 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 Enterprise.
    Enterprise tab in the Site admin settings
  3. In the enterprise account sidebar, click Settings.
    Settings tab in the enterprise account sidebar
  4. Under " Settings", click Options.
    Options tab in the enterprise account settings sidebar
  5. 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

Ask a human

Can't find what you're looking for?

Contact us