GITHUB DESKTOP MERGE CONFLICTS HOW TO
GITHUB DESKTOP MERGE CONFLICTS CODE

If you do have your hand up - first, you look silly right now. I’ll go out on a limb and guess that nobody has a hand up.

To find projects to contribute to, check out GitHub Explore.Raise your hand if you enjoy merge conflicts.

We'd love to hear what you thought of this course in our discussion board.

Make your own Markdown resume site with GitHub Pages! Learn how in our GitHub Pages course.

You created a merge conflict, and resolved it!.

You learned why merge conflicts happen.

Here's a recap of all the tasks you've accomplished in your repository:

Delete the branch my-resume (optional).Ĭongratulations friend, you've completed this course!.

First, resolve any remaining conflicts in your pull request.

You can now merge your pull request! ⌨️ Activity: Merge your pull request

Click the Commit new file button, making sure the 'Commit directly to the my-resume branch' option is selected.

Scroll to the bottom of the page and enter a commit message for your change.

Enter some text that conflicts with what we added for references.md in the main branch.

Click the Add file dropdown menu and then on Create new file.

We went ahead and added a new file called references.md and pushed that change to main, without updating your my-resume branch. (It's for educational purposes!) ⌨️ Activity: Create your own conflict This allows you to test the resolved changes on your branch before you merge it into main. With a reverse merge, only the my-resume branch is updated. This means that the changes from the main branch were merged into your my-resume branch. To resolve a conflict, GitHub performs what is known as a reverse merge. Instead, it stores the resolution of the conflict in a merge commit and allows you and your team to keep working. Resolving a conflict doesn't automatically merge the pull request in GitHub. Good job! You've solved a merge conflict! 🎉

Wait about 20 seconds then refresh this page for the next step.

With the merge conflict markers removed, click Mark as resolved.

Next, remove the merge conflict markers by deleting the following lines:.

Remove the changes made on the main branch by deleting all of the content below the = and above > main.

These markers are added by Git to show you the content that is in conflict.

Look for the highlighted sections that begins with > main.

At the bottom of the page, under 'This branch has conflicts that must be resolved', click the Resolve conflicts button.

Open the pull request we made for you.

Open a new browser tab, and work on the steps in your second tab while you read the instructions in this tab.

GITHUB DESKTOP MERGE CONFLICTS CODE

Sometimes, the best way to resolve a merge conflict is to add content that's from both branches, or even something that isn't on either! This is why Git needs a human to look at the code and make the proper fixes.

GITHUB DESKTOP MERGE CONFLICTS HOW TO

This can be intimidating, but have no fear, Git is smart when it comes to merging! Git only needs a human to decide how to resolve the conflict. You usually find out about conflicts in a pull request. What is a merge conflict?: A merge conflict occurs when changes are made to the same part of the same file on two different branches. Welcome to 'Managing Merge Conflicts'! 👋 Learn why conflicts happen and how to resolve them.

Github desktop merge conflicts