From: Linus Torvalds <torvalds@osdl.org>
To: Len Brown <lenb@kernel.org>
Cc: git@vger.kernel.org
Subject: Re: how to ignore merge conflicts?
Date: Mon, 30 Oct 2006 12:29:37 -0800 (PST) [thread overview]
Message-ID: <Pine.LNX.4.64.0610301223021.25218@g5.osdl.org> (raw)
In-Reply-To: <200610301448.38222.len.brown@intel.com>
On Mon, 30 Oct 2006, Len Brown wrote:
>
> Sometimes when a multiple-file merge give conflicts, I don't want to edit
> one of the resulting <<<<<=====>>>>> files.
> Instead, I just want to choose the version of that particular file that
> existed in one of the two merged branches and commit that along with
> the rest of the merge.
>
> How to do this?
Well, if you promise not to do what has happened several times before in
people who maintained their own CVS trees, for example (which is to just
ignore all merge problems, and force _their_ version, even though the
reason for the merge problem was that somebody else had fixed a bug, that
was now unfixed by the "merge"), here's the trivial way to do it:
git checkout HEAD the/file/you/wanted.c
(or, if you want to take it from the source you are merging _from_, just
use MERGE_HEAD instead of HEAD).
And you're done.
next prev parent reply other threads:[~2006-10-30 20:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-30 19:48 how to ignore merge conflicts? Len Brown
2006-10-30 19:53 ` Shawn Pearce
2006-10-30 20:06 ` Jakub Narebski
2006-10-30 20:29 ` Linus Torvalds [this message]
2006-11-01 7:51 ` Len Brown
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=Pine.LNX.4.64.0610301223021.25218@g5.osdl.org \
--to=torvalds@osdl.org \
--cc=git@vger.kernel.org \
--cc=lenb@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).