From: Shawn Pearce <spearce@spearce.org>
To: Petr Baudis <pasky@suse.cz>
Cc: git@vger.kernel.org
Subject: Re: [RFC] Merge strategy 'applyreject'
Date: Wed, 13 Sep 2006 17:46:54 -0400 [thread overview]
Message-ID: <20060913214654.GD30782@spearce.org> (raw)
In-Reply-To: <20060913211617.GJ23891@pasky.or.cz>
Petr Baudis <pasky@suse.cz> wrote:
> Dear diary, on Wed, Sep 13, 2006 at 11:08:17PM CEST, I got a letter
> where Shawn Pearce <spearce@spearce.org> said that...
> > Create merge strategy 'applyreject'.
> >
> > The applyreject merge strategy is a two head merge strategy which performs
> > the merge by obtaining the diff between the common base and the branch
> > being merged and applies it to the current branch using git-apply --reject.
> > Consequently any failures are written to .rej files, rather than using
> > the RCS <<<<<<< ======= >>>>>>> format.
>
> So, it's essentially the same as the classic resolve strategy, just
> handling rejects differently? I think that should be more obvious from
> its name, perhaps resolve-rej?
Unfortunately. More ideally it would be a configurable feature
of merge-recur that gets used rather than invoking the RCS merge.
This is just a quick and dirty 3 line shell script to propose
the concept.
> .rej files, what a nuisance to handle those... :)
A matter of opinion. :)
--
Shawn.
next prev parent reply other threads:[~2006-09-13 21:47 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
2006-09-13 22:26 ` Shawn Pearce
2006-09-13 21:50 ` Petr Baudis
2006-09-13 21:46 ` Shawn Pearce [this message]
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=20060913214654.GD30782@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
--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 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.