* 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. This usually means that someone or something has edited source files under revision control. "git pull" needs to perform a merge, and this fails if there are changes which cannot be merged automatically. > How do I fix this? "git checkout ." and "git reset --hard" in the affected subdirectory, to discard local changes (if these changes are indeed spurious). _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
