From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: Re: [RFC] Merge strategy 'applyreject'
Date: Wed, 13 Sep 2006 23:54:23 +0200 [thread overview]
Message-ID: <ee9ult$mtn$1@sea.gmane.org> (raw)
In-Reply-To: 20060913215043.GE30782@spearce.org
Shawn Pearce wrote:
> But I don't really want this as a merge strategy in its own right.
> I want it as part of merge-recur (...)
Wouldn't it be better to have pluggable way to deal with conflicts,
be it diff3/merge with conflict markers, .rej files, or invoking
graphical merge tool (vimdiff, Emacs Emerge, xxdiff, Meld, KDiff3)?
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
next prev parent reply other threads:[~2006-09-13 21:54 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-09-13 21:08 [RFC] Merge strategy 'applyreject' Shawn Pearce
2006-09-13 21:16 ` Petr Baudis
2006-09-13 21:43 ` Junio C Hamano
2006-09-13 21:50 ` Shawn Pearce
2006-09-13 21:54 ` Jakub Narebski [this message]
2006-09-13 22:26 ` Shawn Pearce
2006-09-13 21:50 ` Petr Baudis
2006-09-13 21:46 ` Shawn Pearce
2006-09-13 21:22 ` Jakub Narebski
2006-09-13 21:38 ` Shawn Pearce
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='ee9ult$mtn$1@sea.gmane.org' \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.