From: Ben Lau <benlau@ust.hk>
To: Git Mailing List <git@vger.kernel.org>
Subject: Branches merging by only overwrite files
Date: Sun, 11 Dec 2005 16:30:49 +0800 [thread overview]
Message-ID: <439BE3B9.3040308@ust.hk> (raw)
Hi,
I am looking for a solution to merge two branches but do not perform
file level merge. Instead, I wish the result file is the copy from any
one of the branches.
For example, assumes it has two branches A and B, some of the files
are modified in both of them. In this case, `/usr/bin/merge` could not
be execated, it just have to choose the revision from branch A and
discards all the changes from B. For the rest of files, it just simply
choose the newest copy from A or B.
How can I perform this action?
Thanks in advance.
next reply other threads:[~2005-12-11 8:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-12-11 8:30 Ben Lau [this message]
2005-12-11 9:33 ` Branches merging by only overwrite files Junio C Hamano
2005-12-11 11:15 ` Ben Lau
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=439BE3B9.3040308@ust.hk \
--to=benlau@ust.hk \
--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).