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

mirror of synced 2026-01-06 06:02:35 -05:00

Files

Laura Coursen 8f964ea2cb GHEC version (#20947 )

Co-authored-by: Matt Pollard <mattpollard@users.noreply.github.com>
Co-authored-by: Grace Park <gracepark@github.com>
Co-authored-by: Steve Guntrip <12534592+stevecat@users.noreply.github.com>
Co-authored-by: Robert Sese <sese@github.com>
Co-authored-by: Peter Bengtsson <peterbe@github.com>
Co-authored-by: Rachael Sewell <rachmari@github.com>

2021-10-15 15:41:33 -05:00

592 B

Raw Blame History

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

fpt	ghes	ghae	ghec
*	*	*	*

Pull requests

/about-merge-conflicts

/resolving-a-merge-conflict-on-github

/resolving-a-merge-conflict-using-the-command-line

Address merge conflicts

592 B Raw Blame History

592 B

Raw Blame History