[darcs-users] Resolve problem?

[Jamie Webb]

On Tue, May 16, 2006 at 01:47:09PM +0200, Ketil Malde wrote:
> I have a repo that contains conflicting patches.  When one of these
> was pulled in, darcs marked the conflict.  I resolved it, and recorded
> the new patch.  Unfortunately, when I do 'darcs resolve', the conflict
> is still there, and gets marked anew.
> 
> Is there a standard way to deal with this?

Darcs considers a conflict resolved when you record a patch depending
on the conflicting patches. Most likely your resolution was equivalent
to saying 'darcs revert', so no dependency was created. You can force
one using --ask-deps.

-- Jamie Webb