How to resolve inconsistencies with git

[Thomas Schilling]

This might help: http://progit.org/book/ch3-2.html#basic_merge_conflicts

In GHC you have to figure out which subdirectory the conflict happened
in and then fix it in that repository.

If your error is happening in the haddock subdirectory, then you
probably need to delete that directory and run ./sync-all get again.
There was a recent email about that.  Search your mail history for
"HEADS UP".

On 1 July 2011 06:34, Vivian McPhail <haskell.vivian.mcphail at gmail.com> wrote:
> Hi,
>
> 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?
>
> Vivian
>
> _______________________________________________
> Cvs-ghc mailing list
> Cvs-ghc at haskell.org
> http://www.haskell.org/mailman/listinfo/cvs-ghc
>
>



-- 
Push the envelope. Watch it bend.