From: Geoff Russell <geoffrey.russell@gmail.com>
To: git@vger.kernel.org
Subject: Merging a branch when I don't want conflicts
Date: Mon, 18 May 2009 12:00:46 +0930 [thread overview]
Message-ID: <93c3eada0905171930m36765d4fued9c2efdc57e51a4@mail.gmail.com> (raw)
How do I merge a branch X into my master and tell git that whenever there
is a conflict, the file on X should prevail? This is for a scripted
application.
Cheers,
Geoff
next reply other threads:[~2009-05-18 2:30 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-18 2:30 Geoff Russell [this message]
2009-05-18 6:18 ` Merging a branch when I don't want conflicts Johannes Sixt
2009-05-18 8:05 ` Geoff Russell
2009-05-18 9:01 ` Johannes Sixt
2009-05-18 23:53 ` Geoff Russell
2009-05-18 10:45 ` Nanako Shiraishi
2009-05-18 15:57 ` Tay Ray Chuan
2009-05-18 16:17 ` Junio C Hamano
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=93c3eada0905171930m36765d4fued9c2efdc57e51a4@mail.gmail.com \
--to=geoffrey.russell@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 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).