The Wayback Machine - https://web.archive.org./web/20201026163634/https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/addressing-merge-conflicts

Explore by product

GitHub.com
English
Article version: Free, Pro, and Team
Free, Pro, and Team Enterprise Server 2.22 Enterprise Server 2.21 Enterprise Server 2.20 Enterprise Server 2.19
Article version: Free, Pro, and Team
Free, Pro, and Team Enterprise Server 2.22 Enterprise Server 2.21 Enterprise Server 2.20 Enterprise Server 2.19

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.

Did this doc help you?

Help us make these docs great!

All GitHub docs are open source. See something that's wrong or unclear? Submit a pull request.

Make a contribution

Or, learn how to contribute.

About merge conflicts→

Merge conflicts happen when you merge branches that have competing commits, and Git needs your help to decide which changes to incorporate in the final merge.

Resolving a merge conflict on GitHub→

You can resolve simple merge conflicts that involve competing line changes on GitHub, using the conflict editor.

Resolving a merge conflict using the command line→

You can resolve merge conflicts using the command line and a text editor.

Did this doc help you?

Help us make these docs great!

All GitHub docs are open source. See something that's wrong or unclear? Submit a pull request.

Make a contribution

Or, learn how to contribute.

Still need help?

Ask the GitHub community Contact support

Product

Platform

Support

Company