Skip to content

resolving-a-merge-conflict-on-github.md

Latest commit

 

History

History
60 lines (46 loc) · 4.5 KB

resolving-a-merge-conflict-on-github.md

File metadata and controls

60 lines (46 loc) · 4.5 KB
Raw
title Resolving a merge conflict on GitHub
intro Resolve simple merge conflicts directly on {% data variables.product.github %} using the conflict editor or handle complex cases via the command line.
redirect_from
/github/collaborating-with-issues-and-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github
/articles/resolving-a-merge-conflict-on-github
/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-on-github
/github/resolving-a-merge-conflict-on-github
/github/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github
/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github
versions
fpt ghes ghec
*
*
*
shortTitle Resolve merge conflicts
category
Merge and close pull requests
contentType how-tos

You can resolve simple competing line change conflicts on {% data variables.product.github %}. For other conflicts, use the command line. See AUTOTITLE.

{% ifversion fpt or ghec %} If {% data variables.copilot.copilot_cloud_agent %} is enabled for the repository, you can click Fix with {% data variables.product.prodname_copilot_short %} in the merge box to have {% data variables.product.prodname_copilot_short %} resolve conflicts automatically. See AUTOTITLE. {% endif %}

{% ifversion ghes %} If a site administrator disables the merge conflict editor for pull requests between repositories, resolve merge conflicts on the command line. {% endif %}

Warning

Resolving conflicts on {% data variables.product.github %} merges the entire base branch into the head branch. If the head branch is the default or protected branch, you may be prompted to create a new head branch. See AUTOTITLE.

{% data reusables.repositories.sidebar-pr %}

  1. In the "Pull Requests" list, click the pull request with a merge conflict that you want to resolve.

  2. Near the bottom of your pull request, click Resolve conflicts.

    Screenshot of a warning that a pull request has a merge conflict. The "Resolve merge conflicts" button is outlined in dark orange.

    [!NOTE] If Resolve conflicts is deactivated, resolve the conflict using another Git client or the command line. See AUTOTITLE.

{% data reusables.pull_requests.decide-how-to-resolve-competing-line-change-merge-conflict %}

  1. If your file has more than one merge conflict, scroll down to the next set of conflict markers and repeat steps four and five to resolve the conflict.

  2. After you've resolved all the conflicts in the file, click Mark as resolved.

    Screenshot of the editor to resolve a merge conflict in a pull request. The "Mark as resolved" button is outlined in dark orange.

  3. If more than one file has a conflict, select the next file you want to edit on the left side of the page under "conflicting files" and repeat steps four through seven until you've resolved all merge conflicts in your pull request.

  4. After you've resolved all your merge conflicts, click Commit merge. This merges the entire base branch into your head branch.

    Screenshot of the editor to resolve a merge conflict in a pull request. The "Commit merge" button is outlined in dark orange.

  5. If prompted, review the branch that you are committing to. You can update the head branch or, if available, create a new branch for the pull request. If the head branch is protected, you must create a new branch.

    Click Create branch and update my pull request or I understand, continue updating BRANCH.

  6. To merge your pull request, click Merge pull request. See AUTOTITLE.

Further reading