[darcs-users] Help: pending has conflicts
alistair at abayley.org
Mon Oct 15 14:39:15 UTC 2007
> > 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?
I have now. I also had to go into current and remove the files, which
had somehow ended up in there (I don't know how, as they AFAICT have
not been added to the repo).
Seems to be OK now.
More information about the darcs-users