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.

To keep the user file system from growing too large, users will receive a warning message if they add new files or update existing files larger than 50 MB. Additionally, end users will be blocked by default from pushing files or updating existing files larger than 100 MB.