From: "J.V." <jvsrvcs@gmail.com>
To: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: which files will have conflicts between two branches?
Date: Wed, 27 Mar 2013 15:48:59 -0600 [thread overview]
Message-ID: <5153694B.2010405@gmail.com> (raw)
I have two local branches (tracked to remote) that are in sync (did a
git pull on both branches from their corresponding remote).
Is this the best way to merge?
I would be merging local/branch1 => local/branch2 (test this branch) and
then push local/branch2 => origin/branch1 (and would expect no merge
conflicts if anyone has not checked in anything.
---
Also with two local branches, Is there a way to get a list of files (one
line per file) of files that would have merge conflicts that would need
to be resolved?
thanks
J.V.
next reply other threads:[~2013-03-27 21:50 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-27 21:48 J.V. [this message]
2013-03-28 16:17 ` which files will have conflicts between two branches? Magnus Bäck
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=5153694B.2010405@gmail.com \
--to=jvsrvcs@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.