From: "Caleb Cushing" <xenoterracide@gmail.com>
To: SLONIK.AZ@gmail.com
Cc: "Andreas Ericsson" <ae@op5.se>, git@vger.kernel.org
Subject: Re: more merge strategies : feature request
Date: Tue, 2 Dec 2008 08:46:00 -0500 [thread overview]
Message-ID: <81bfc67a0812020546o79906a20jcd04bd42d18dd803@mail.gmail.com> (raw)
In-Reply-To: <ee2a733e0812011849l1b319c96u9abbb4e8dd4f53ce@mail.gmail.com>
> I guess that "no-overwrite" can be achieved by
>
> git merge -s ours --no-commit
no it doesn't. which is why I called it a bad name. no-overwrite would
still add new lines to the file not in ours (and no-commit isn't
needed in that case) it just wouldn't overwrite conflicting lines, my
understanding of ours is that it will keep the files as is.
Caleb Cushing
next prev parent reply other threads:[~2008-12-02 13:47 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
2008-12-02 13:46 ` Caleb Cushing [this message]
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=81bfc67a0812020546o79906a20jcd04bd42d18dd803@mail.gmail.com \
--to=xenoterracide@gmail.com \
--cc=SLONIK.AZ@gmail.com \
--cc=ae@op5.se \
--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 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).