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

Alistair Bayley alistair at abayley.org
Mon Oct 20 12:02:19 UTC 2008


2008/10/17 Eric Kow <kowey at darcs.net>:
> 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.

That fixed it, thanks Eric.

Alistair


More information about the darcs-users mailing list