docs/content/github/collaborating-with-pull-requests/addressing-merge-conflicts/index.md

title, intro, redirect_from, versions, topics, children

title	intro	redirect_from	versions	topics	children
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.	/github/collaborating-with-issues-and-pull-requests/addressing-merge-conflicts/ /articles/addressing-merge-conflicts	free-pro-team enterprise-server github-ae * * *	Pull requests	/about-merge-conflicts /resolving-a-merge-conflict-on-github /resolving-a-merge-conflict-using-the-command-line