From: Anton Ermolenko <aermolenko@atlassian.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [QUESTION] Git fails to detect merge conflict?
Date: Fri, 5 Jul 2019 10:45:07 +1000 [thread overview]
Message-ID: <70A38295-66D4-43B0-87EF-EA3EB5C0CEAE@atlassian.com> (raw)
In-Reply-To: <20190702001528.GA94153@google.com>
Hello!
Thanks for you answer.
The original content of the file:
--- START ---
LINE 1
LINE 2
LINE 3
--- END —
Branch “change-a” modifies it to become:
--- START ---
LINE 1
LINE 2
LINE 3
LINE 4
LINE 5
LINE 6
LINE 7
LINE 8
LINE 9
--- END —
While branch “change-b” modifies it to become:
--- START ---
LINE 1
LINE B
LINE 3
LINE D
LINE E
LINE 3
--- END —
Now, on master I’m able to perform “—no-ff” merge with and git does not detect any conflict.
The result is this:
--- 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 —
Which is both changes applied sequentially - first, the change from “change-b” as it happens to be earlier in the file, then change from “change-a”.
Thank you,
Anton.
> On 2 Jul 2019, at 10:15 am, Jonathan Nieder <jrnieder@gmail.com> wrote:
>
> Anton Ermolenko wrote:
>
>> 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.
>
> Yes, that seems right to me.
>
> Do you have more details about the context? What do these files look
> like? Are there other cues that we could use to discover that the
> customer intended the changes to conflict?
>
> Thanks,
> Jonathan
prev parent reply other threads:[~2019-07-05 0:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-01 23:28 [QUESTION] Git fails to detect merge conflict? Anton Ermolenko
2019-07-02 0:15 ` Jonathan Nieder
2019-07-05 0:45 ` Anton Ermolenko [this message]
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=70A38295-66D4-43B0-87EF-EA3EB5C0CEAE@atlassian.com \
--to=aermolenko@atlassian.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
/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).