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

title, intro, redirect_from, versions, topics, children, shortTitle

title	intro	redirect_from	versions	topics	children	shortTitle
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 /github/collaborating-with-pull-requests/addressing-merge-conflicts	fpt ghes ghec * * *	Pull requests	/about-merge-conflicts /resolving-a-merge-conflict-on-github /resolving-a-merge-conflict-using-the-command-line	Address merge conflicts