Re: [PATCH] Introducing cg-xxdiff for conflict resolution

From: Petr Baudis <pasky@suse.cz>
Date: Sep 24, 2006, 17:12 UTC
Message-ID: <20060924171246.GY13132@pasky.or.cz>
In-Reply-To: <46a038f90609241002i1db98ed6n118077089c9e417f@mail.gmail.com>

Dear diary, on Sun, Sep 24, 2006 at 07:02:28PM CEST, I got a letter where Martin Langhoff <martin.langhoff@gmail.com> said that...

Show 11 quoted lines

> On 9/24/06, Petr Baudis <pasky@suse.cz> wrote:
> >Hmm, I think this would be generally more useful during the actual merge
> >phase - if merge returns error, you fire up
> >git-magic-conflict-resolution-driver and have fun.
> 
> Well, in many cases the conflict markers are just ok and exactly what
> I want. If the two sides of the conflict are clear, the resolution is
> usually clear as well. OTOH, it may be a big mess where xxdiff gives
> more visual cues as to WTF is going on...
> 
> IOW I don't want it to be part of the merge automagically...

In that case I think the most natural way for this tool to interface would be in part of some kind of cg-resolve swiss-army knife for resolving conflicts:

	cg-resolve --mine	for taking just the version from _my_
				side of the merge
	cg-resolve --other	dtto for the other side of the merge
	cg-resolve -g		graphically resolve
				(vimdiff/xxdiff/meld/...)
	surely more would be invented over time

Show 6 quoted lines

> >> +. git-sh-setup
> >
> >Uh-oh. :-)
> 
> Is that bad? <blush> I am not doing anything too cogito-specific, and
> I just don't know what cg-Xlib will do for me...

Well, all the Cogito scripts should have some consistent form. :-)

But I can adjust such details when applying your patch.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
#!/bin/perl -sp0777i<X+d*lMLa^*lN%0]dsXx++lMlN/dsM0<j]dsj
$/=unpack('H*',$_);$_=`echo 16dio\U$k"SK$/SM$n\EsN0p[lN*1
lK[d2%Sa2/d0$^Ixp"|dc`;s/\W//g;$_=pack('H*',/((..)*)$/)