git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: Anton Ermolenko <aermolenko@atlassian.com>
Cc: git@vger.kernel.org
Subject: Re: [QUESTION] Git fails to detect merge conflict?
Date: Mon, 1 Jul 2019 17:15:28 -0700	[thread overview]
Message-ID: <20190702001528.GA94153@google.com> (raw)
In-Reply-To: <E42B8D46-0CA0-44E0-946F-8ADA96993629@atlassian.com>

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

  reply	other threads:[~2019-07-02  0:15 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 [this message]
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=20190702001528.GA94153@google.com \
    --to=jrnieder@gmail.com \
    --cc=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).