From: "Martin Langhoff" <martin.langhoff@gmail.com>
To: "Petr Baudis" <pasky@suse.cz>
Cc: "Martin Langhoff" <martin@catalyst.net.nz>, git@vger.kernel.org
Subject: Re: [PATCH] Introducing cg-xxdiff for conflict resolution
Date: Sun, 24 Sep 2006 18:02:28 +0100 [thread overview]
Message-ID: <46a038f90609241002i1db98ed6n118077089c9e417f@mail.gmail.com> (raw)
In-Reply-To: <20060924165037.GS20017@pasky.or.cz>
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...
> > +. 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...
> > +git cat-file blob `git rev-parse FETCH_HEAD`:$FILE > $FILE~branch
>
> Cogito does not use FETCH_HEAD.
eeek. you ar right. I mix and match git and cogito as you can see. Not
so smart. I see cg-merge uses merging, merge-base and merging-sym --
I'll rework it using those...
cheers,
martin
next prev parent reply other threads:[~2006-09-24 17:02 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-08-04 3:34 [PATCH] Introducing cg-xxdiff for conflict resolution Martin Langhoff
2006-09-24 16:50 ` Petr Baudis
2006-09-24 17:02 ` Martin Langhoff [this message]
2006-09-24 17:12 ` Petr Baudis
2006-09-24 17:22 ` Martin Langhoff
2006-09-24 17:28 ` Petr Baudis
2006-11-02 23:40 ` Martin Langhoff
2006-11-03 0:11 ` Petr Baudis
2006-11-03 2:41 ` Martin Langhoff
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=46a038f90609241002i1db98ed6n118077089c9e417f@mail.gmail.com \
--to=martin.langhoff@gmail.com \
--cc=git@vger.kernel.org \
--cc=martin@catalyst.net.nz \
--cc=pasky@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).