[darcs-users] Help: pending has conflicts

[Pekka Pessi]

2007/10/1, Alistair Bayley <alistair at abayley.org>:
...
> Yikes, pending has conflicts!
...
> The four deleted files exist on the filesystem, but they should not be
> part of the repo, as they are generated from .hs sources. I've done
> darcs repair and check, so I'm at a bit of a loss as to what to do
> next.

You have tried to remove _darcs/patched/pending?

-- 
Pekka.Pessi mail at nokia.com