close
The Wayback Machine - https://web.archive.org/web/20220526021636/https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts
Skip to main content
Free, Pro, & Team
English
Sign up
 
Pull requests
Free, Pro, & Team
English
Sign up

 

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.