[darcs-users] Re: Darcs spins

[John Goerzen]

On 2004-10-25, Mark Stosberg <mark at summersault.com> wrote:
> On 2004-10-25, John Goerzen <jgoerzen at complete.org> wrote:
>> I couldn't really find anything on conflict resolution (without some
>> sort of external command) in the docs... pointers?
>
> What version of darcs are you using? Are you seeing "Conflicts in
> pending", or conflicts in particular files? 

I have 1.0.0rc3.  I'm seeing conflicts in particular files, and the
situation I have here is that the patches I'm pulling may try to create
a file that already exists, or at some point in their history created a
file that already exists, but in later patches that I'm pulling, deleted
it.

-- John