From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: Re: how to ignore merge conflicts?
Date: Mon, 30 Oct 2006 21:06:00 +0100 [thread overview]
Message-ID: <ei5lv0$2jv$1@sea.gmane.org> (raw)
In-Reply-To: 200610301448.38222.len.brown@intel.com
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?
$ git cat-file -p :<n>:<filename> > <filename>
$ git update-index <filename>
where <n> is one of stages, 1 or 2 to choose one branch version if I
remember correctly. Check out documentation.
Or just use 'ours' as merge strategy...
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
next prev parent reply other threads:[~2006-10-30 20:24 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 [this message]
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='ei5lv0$2jv$1@sea.gmane.org' \
--to=jnareb@gmail.com \
--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 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.