From: "Leo Razoumov" <slonik.az@gmail.com>
To: "Andreas Ericsson" <ae@op5.se>
Cc: "Caleb Cushing" <xenoterracide@gmail.com>, git@vger.kernel.org
Subject: Re: more merge strategies : feature request
Date: Mon, 1 Dec 2008 21:49:08 -0500 [thread overview]
Message-ID: <ee2a733e0812011849l1b319c96u9abbb4e8dd4f53ce@mail.gmail.com> (raw)
In-Reply-To: <4933AC03.6050300@op5.se>
On 12/1/08, Andreas Ericsson <ae@op5.se> wrote:
> Caleb Cushing wrote:
>
> > conflict: this strategy would always resolve in a merge conflict
> > allowing you to use git mergetool to piece the files back together.
> >
> > no-overwrite: if a change from the branch being merged in would
> > overwrite something in the current branch don't merge it. (I think it
> > needs a better name)
> >
I guess that "no-overwrite" can be achieved by
git merge -s ours --no-commit
--Leo--
next prev parent reply other threads:[~2008-12-02 2:50 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-29 16:48 more merge strategies : feature request Caleb Cushing
2008-12-01 9:18 ` Andreas Ericsson
2008-12-02 2:38 ` Caleb Cushing
2008-12-02 3:30 ` Jeff King
2008-12-02 14:28 ` Caleb Cushing
2008-12-02 15:30 ` Jeff King
2008-12-02 2:49 ` Leo Razoumov [this message]
2008-12-02 13:46 ` Caleb Cushing
2008-12-03 1:07 ` Leo Razoumov
2008-12-03 21:27 ` Nanako Shiraishi
2008-12-03 22:59 ` Caleb Cushing
2008-12-04 2:15 ` Junio C Hamano
2008-12-04 10:11 ` Nanako Shiraishi
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=ee2a733e0812011849l1b319c96u9abbb4e8dd4f53ce@mail.gmail.com \
--to=slonik.az@gmail.com \
--cc=ae@op5.se \
--cc=git@vger.kernel.org \
--cc=xenoterracide@gmail.com \
/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).