[darcs-users] Does rollback resolve merge conflicts?

[David Roundy]

On Fri, Oct 08, 2004 at 01:18:46PM -0500, Taral wrote:
> On Fri, Oct 08, 2004 at 07:02:57PM +0200, Juliusz Chroboczek wrote:
> > Given a pairwise merge conflict (between just two patches) does
> > rolling back one of the two resolve the conflict?
> 
> It should.

It does.  Which, alas, isn't always the same as "It should."...
-- 
David Roundy
http://www.abridgegame.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : http://lists.osuosl.org/pipermail/darcs-users/attachments/20041009/cdf49642/attachment.pgp