From: Anton Ermolenko <aermolenko@atlassian.com>
To: git@vger.kernel.org
Subject: [QUESTION] Git fails to detect merge conflict?
Date: Tue, 2 Jul 2019 09:28:26 +1000 [thread overview]
Message-ID: <E42B8D46-0CA0-44E0-946F-8ADA96993629@atlassian.com> (raw)
Hello folks,
I'm writing on behalf of a customer and I wonder if you could help me to clarify
if the following test case should be considered a bug or if it is expected
behavior.
# create repository
git init
# add initial content
cat << EOF > example.txt
--- START ---
LINE 1
LINE 2
LINE 3
--- END ---
EOF
# commit the changes
git add example.txt && git commit -m "Initial Commit"
# create a branch
git checkout -b change-a
# introduce a change
cat << EOF > example.txt
--- START ---
LINE 1
LINE 2
LINE 3
LINE 4
LINE 5
LINE 6
LINE 7
LINE 8
LINE 9
--- END ---
EOF
# commit the change
git commit -am "change a"
# return to master and create another branch
git checkout master && git checkout -b change-b
# introduce another change
cat << EOF > example.txt
--- START ---
LINE 1
LINE B
LINE 3
LINE D
LINE E
LINE 3
--- END ---
EOF
git commit -am "change b"
At this point the "change-a" diff with master is:
diff --git a/example.txt b/example.txt
index 1cebaff..605f2b0 100644
--- a/example.txt
+++ b/example.txt
@@ -3,5 +3,11 @@
LINE 1
LINE 2
LINE 3
+ LINE 4
+ LINE 5
+ LINE 6
+ LINE 7
+ LINE 8
+ LINE 9
--- END ---
and "change-b" diff with master is:
diff --git a/example.txt b/example.txt
index 1cebaff..cf5c0b2 100644
--- a/example.txt
+++ b/example.txt
@@ -1,7 +1,10 @@
--- START ---
LINE 1
- LINE 2
+ LINE B
+ LINE 3
+ LINE D
+ LINE E
LINE 3
--- END ---
If a user to merge branches with "no-fast-forward" strategy, git does not detect
a conflict:
# merge change-a first
git merge --no-ff -m "merge change-a" change-a
# merge change-b now
git merge --no-ff -m "merge change-b" change-b
And the resulting content of "example.txt" is:
--- START ---
LINE 1
LINE B
LINE 3
LINE D
LINE E
LINE 3
LINE 4
LINE 5
LINE 6
LINE 7
LINE 8
LINE 9
--- END ---
My understanding is that recursive merge here won't consider that situation to
be a merge conflict as the changes have been introduced in different spots in
the file.
Am I correct or is this a bug?
Thank you,
Anton.
next reply other threads:[~2019-07-01 23:28 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-01 23:28 Anton Ermolenko [this message]
2019-07-02 0:15 ` [QUESTION] Git fails to detect merge conflict? Jonathan Nieder
2019-07-05 0:45 ` Anton Ermolenko
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E42B8D46-0CA0-44E0-946F-8ADA96993629@atlassian.com \
--to=aermolenko@atlassian.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).