Article version: Enterprise Server 2.18
Addressing merge conflicts
If your changes have merge conflicts with the base branch, you must address the merge conflicts before you can merge your pull request's changes.
This version of GitHub Enterprise will be discontinued on This version of GitHub Enterprise was discontinued on 2020-08-20. No patch releases will be made, even for critical security issues. For better performance, improved security, and new features, upgrade to the latest version of GitHub Enterprise. For help with the upgrade, contact GitHub Enterprise support.