CODEWITHSUNDEEP
gitgithub
jonasPamm
jonasPamm

Reputation: 97

GitHub Merge pull request conflicts

I created a pull request and I tried to Merge it but now this pops up: enter image description here

When I click Resolve conflicts this comes up: enter image description here

What can I do to merge this pull request. Here is the link to the repo: https://github.com/Jonas-Pamminger/WMC_ARWebsite

Upvotes: 0

Views: 2621

Answers (1)

Peaky_001
Peaky_001

Reputation: 1137

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

2.Near the bottom of your pull request, click Resolve conflicts. enter image description here

Tip: If the Resolve conflicts button is deactivated, your pull request's merge conflict is too complex to resolve on GitHub. You must resolve the merge conflict using an alternative Git client, or by using Git on the command line. For more information see "Resolving a merge conflict using the command line."

3.Decide if you want to keep only your branch's changes, keep only the other branch's changes, or make a brand new change, which may incorporate changes from both branches. Delete the conflict markers <<<<<<<, =======, >>>>>>> and make the changes you want in the final merge.

enter image description here

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

5.Once you've resolved all the conflicts in the file, click Mark as resolved. enter image description here

6.If you have more than one file with 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 of your pull request's merge conflicts. enter image description here

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

enter image description here

8.If prompted, review the branch that you are committing to.

If the head branch is the default branch of the repository, you can choose either to update this branch with the changes you made to resolve the conflict, or to create a new branch and use this as the head branch of the pull request. enter image description here

If you choose to create a new branch, enter a name for the branch.

If the head branch of your pull request is protected you must create a new branch. You won't get the option to update the protected branch.

Click Create branch and update my pull request or I understand, continue updating BRANCH. The button text corresponds to the action you are performing.

9.To merge your pull request, click Merge pull request. For more information about other pull request merge options, see "Merging a pull request."

Upvotes: 1

Related Questions