Git: Resolving Merge Conflicts from the command line How to resolve merge conflicts in Git External Link https://help.github.com/articles/resolving-a-merge-conflict-from-the-command-li…