As a follow up to my earlier blog Azure Resource Manager – Getting started with GitHub, I got asked how to look at the differences between a repository in GitHub and your local clone before merging all the changes.
As an alternative to Git pull you can also perform the individual commands (fetch and merge).
This will allow you to get the changes, evaluate potential conflicts and solve them first, before you merge. Let’s start with the same example as in Azure Resource Manager – Getting started with GitHub. We have a repository in GitHub with a README.md file already in there and we create a local clone. After we make a change to the README.md file locally, we also make a change to the file directly on GitHub.
Instead of pull (which does the fetch and merge), we can just fetch the changes from the origin.
Git fetch origin master
The fetch command does not make any changes to your local clone yet. You can first evaluate the changes by running
Git diff master origin
This will compare your master branch to the origin (your repository in GitHub). As you can see from the output we can now first solve the conflict manually, do a Git add and a commit and then merge. If you try to merge without solving the conflict first by running
Git merge origin master
You will end up in the same position as the pull request. When you open the README.md file you’ll notice the same issue.
You resolve a conflict by editing the file to manually merge the parts of the file that Git had trouble merging. This may mean discarding either your changes or someone else’s or doing a mix of the two. You will also need to delete the ‘«««<‘, ‘=======’, and ‘»»»>’ in the file.
Next perform an
Git add and a
After pushing your clone to GitHub you have successfully merged the local changes and the repository is in sync with your local clone. By using
Merge you are able to interact with your files at each step.
Git Pull performs these steps in a single action.