Simon Peyton Jones <simo...@microsoft.com> writes:

> |  meantime the issue can be worked around by reverting
> |  accbc242e555822a2060091af7188ce6e9b0144e.
>
> Alas, not so.
>
> git revert accbc242e555822a2060091af7188ce6e9b0144e
> warning: Failed to merge submodule utils/haddock (commits don't follow 
> merge-base)
> error: could not revert accbc242e5... DynFlags: disentangle Outputable
> hint: after resolving the conflicts, mark the corrected paths
> hint: with 'git add <paths>' or 'git rm <paths>'
> hint: and commit the result with 'git commit'
>
Sigh, yes, this is what I was afraid of. Strangely, Hadrian's validate
flavour doesn't appear to be affected by the issue that you reported.
Are you using the make build system by any chance?

Cheers,

- Ben

Attachment: signature.asc
Description: PGP signature

_______________________________________________
ghc-devs mailing list
ghc-devs@haskell.org
http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs

Reply via email to