* Vivian McPhail:
> 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.
Thi
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 ./
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
