Requiring users to resolve merge conflicts locally on their computer can prevent people from inadvertently writing to an upstream repository from a fork.
- In the upper-right corner of any page, click .
- In the left sidebar, click Enterprise.
- In the enterprise account sidebar, click Settings.
- Under " Settings", click Options.
- Under "Conflict editor for pull requests between repositories", use the drop-down menu, and click Disabled.