How to resolve inconsistencies with git
haskell.vivian.mcphail at gmail.com
Fri Jul 1 07:34:05 CEST 2011
I successfully downloaded and installed, using git, the GHC HEAD. The build
was successful. However, I just tried to `./sync-all pull` but there were
conflicts and the action was not successful. Now I get:
Pull 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, or use 'git commit -a'.
git failed: 256 at ./sync-all line 184.
How do I fix this?
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the Cvs-ghc