Re: How do git recognize conflicts?

From: Johannes Sixt <j6t@kdbg.org>
Date: Sep 5, 2024, 16:39 UTC
Message-ID: <cbc0019a-682a-4cec-8a06-24b12060a692@kdbg.org>
In-Reply-To: <CADLV-7K-D8ydFfeojv7EuhxBqKWsVYLofXJji+Y5rUTA8JEQ7w@mail.gmail.com>

Am 05.09.24 um 16:10 schrieb KwonHyun Kim:

Show 26 quoted lines

>  Hi, there.
> 
>  At first, I thought it's determined by line.
> 
>  But as I experimented, it does not look so.
> 
>  Here's what I experimented
> 
>  merge-base ====
> 
>  hi all
> 
>  branch BrA ===
> 
>  hi everyone
> 
>  branch BrB ===
> 
>  hi all
>  good to see you
> 
>  when I merge BrB from BrA, I get conflicts.
> 
>  but the first line is only changed in BrA,
>  and BrB added a line so there is no reason to have a conflict...
>  that's what i think

If the changes in the two branches are in adjacent lines, then that is considered a conflict as well.

-- Hannes