From: meanlogin@gmail.com
To: git@vger.kernel.org
Subject: possibly a spurious conflict in a three way merge
Date: Thu, 07 Aug 2014 12:30:22 -0400 [thread overview]
Message-ID: <53E3A99E.1090102@gmail.com> (raw)
git 2.0.4 on ubuntu 14.04 64
1. new repo
2. commit test.txt to master:
line1
line1
3. branch and checkout branch1
4. make and commit the following change to branch1:
#line1
#line2
5. checkout master
6. make and commit the following change to master:
line1
#line2
7. merge branch1, git sees a conflict:
<<<<<<< HEAD
line1
=======
#line1
>>>>>>> branch1
#line2
Why? The first line changed in branch1 but not in master so a 3 way
merge should take branch1 changes. Beyond Compare ( used as a
mergetool) does not flag any conflicts.
next reply other threads:[~2014-08-07 16:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-07 16:30 meanlogin [this message]
2014-08-07 18:52 ` possibly a spurious conflict in a three way merge Jonathan Nieder
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=53E3A99E.1090102@gmail.com \
--to=meanlogin@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).