Subject: Re: [QUESTION] Git fails to detect merge conflict?

From: Jonathan Nieder <[email-masked]>
Date: Mon, 1 Jul 2019 17:15:28 -0700

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