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

title, intro, mapTopic, redirect_from, versions

title	intro	mapTopic	redirect_from	versions
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.	true	/articles/addressing-merge-conflicts	free-pro-team enterprise-server github-ae * * *