[darcs-users] Re: 'pending has conflicts' with 'darcs mv'

[Mark Stosberg]

On 2004-10-21, Mark Stosberg <mark at summersault.com> wrote:
>
> Yikes, pending has conflicts!

I finally got out of this by backing up _darcs/patches/pending and
editing it by hand.

Is there a better solution, or is this something that 'darcs repair'
should flag it help fix? Perhaps it could copy the 'pending' file and
add some conflict markers. 

	Mark

-- 
http://mark.stosberg.com/