From: Len Brown <len.brown@intel.com>
To: git@vger.kernel.org
Subject: how to ignore merge conflicts?
Date: Mon, 30 Oct 2006 14:48:38 -0500 [thread overview]
Message-ID: <200610301448.38222.len.brown@intel.com> (raw)
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?
thanks,
next reply other threads:[~2006-10-30 19:46 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-30 19:48 Len Brown [this message]
2006-10-30 19:53 ` how to ignore merge conflicts? Shawn Pearce
2006-10-30 20:06 ` Jakub Narebski
2006-10-30 20:29 ` Linus Torvalds
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=200610301448.38222.len.brown@intel.com \
--to=len.brown@intel.com \
--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).