[darcs-users] Push fails because apply fails; conflicts; how to resolve?

Eric Kow kowey at darcs.net
Fri Oct 17 15:40:16 UTC 2008


On Fri, Oct 17, 2008 at 16:36:54 +0100, Alistair Bayley wrote:
> However, darcs pull gets no changes to pull in, so I'm a bit stuck.
> What's the best workflow for finding where the conflicts are and
> resolving them?

It sounds like you've been bitten by a silent bug in a darcs 1.0.9,
i.e. that your working directory on code.haskell.org has some changes
in it which conflict with the patches you are trying to do.  I think
you can revert those changes and darcs repair your repository.

-- 
Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow>
PGP Key ID: 08AC04F9
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 194 bytes
Desc: not available
Url : http://lists.osuosl.org/pipermail/darcs-users/attachments/20081017/7a06ae9f/attachment.pgp 


More information about the darcs-users mailing list