How to Resolve Merge Conflicts Using Github Desktop

How to Resolve Merge Conflicts Using Github Desktop

Download link to Github Desktop: https://github.com/apps/desktop

Greetings, in this Github tutorial we shall be looking at how to resolve merge conflicts when you are merging branches sometimes merge conflicts will occur. Merge conflicts on your git repo can occur when 2 branches you merge have both updated the same file. This means git doesn't know which version of the file to use when merging the branches together.

A simple way to resolve any git merge conflict is to select which branch you want to use for each merge conflict. You can use Github desktop to view the changes in each branch and easily select which files to use. This makes resolving merge conflicts in github really easy.

Thanks for watching this tutorial on how to resolve merge conflicts using github desktop.

If this tutorial on resolving merge conflicts using github desktop was useful, then be sure to subscribe for more Github tutorials.

How to Resolve Merge Conflicts Using Github Desktop Github Desktop: Solve a Merge Conflict Resolving Code Merge with Github Desktop Easily How to resolve a Merge Conflict in GitHub Desktop ... https://www.youtube.com/watch?v=Q5AT8926fLI