![]() ![]() 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. ![]() Once you've resolved all the conflicts in the file, click Mark as resolved. 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. Delete the conflict markers > and make the changes you want in the final merge. For more information see " Resolving a merge conflict using the command line."ĭecide 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. You must resolve the merge conflict using an alternative Git client, or by using Git on the command line. Tip: If the Resolve conflicts button is deactivated, your pull request's merge conflict is too complex to resolve on GitHub.
0 Comments
Leave a Reply. |