👋 We've unified all of GitHub's product documentation in one place! Check out the content for REST API, GraphQL API, and Developers. Learn more on the GitHub blog.
Article version: GitHub.com

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.

Were you able to find what you were looking for?

Were you able to find what you were looking for?

Ask a human

Can't find what you're looking for?

Contact us