Created
November 17, 2011 16:36
-
-
Save chartjes/1373664 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| fatal: 'merge' is not possible because you have unmerged files. | |
| Please, fix them up in the work tree, and then use 'git add/rm <file>' as | |
| appropriate to mark resolution and make a commit, or use 'git commit -a'. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment