[prev in list] [next in list] [prev in thread] [next in thread] 

List:       darcs-users
Subject:    Re: [darcs-users] How to resolve merge conflicts without GUI?
From:       Thomas Zander <TZander () factotummedia ! nl>
Date:       2005-02-02 13:07:54
Message-ID: 20050202130754.GA13108 () factotummedia ! nl
[Download RAW message or body]


On Thu, Jan 27, 2005 at 07:22:33AM -0500, David Roundy wrote:
> On Wed, Jan 26, 2005 at 06:40:49PM +0100, Thomas Zander wrote:
> > I would also like to know why different markers were chosen; they are
> > much more annoying to type in a search then the >>> or <<< from cvs...
> 
> It's because in darcs you can have a three-way conflict (or worse), in
> which case it's not clear how to choose the >>> and <<< directions.  That's
> not a very good reason, and it's something I'll happily consider changing
> when the new conflict code is being finished.

I'd like to see that; and if nothing else; please don't add spaces between
the vs or ^s.  Its much easier to type "^^^^" then "^ ^ ^ ^" in your
search dialog :-)

Cheers!
-- 
Thomas Zander

[Attachment #3 (application/pgp-signature)]

[prev in list] [next in list] [prev in thread] [next in thread]