From: martin <test2@mfriebe.de>
Date: Sat, 03 Jul 2021 09:07:25 GMT
Subject: Re: Logical bug during MERGE or REBASE
Message-ID: <4bae5d01-fa6d-7216-55cf-fa7003f5c75c@mfriebe.de>
In-Reply-To: <1932019063.20210702192555@wp.pl>

On 02/07/2021 18:25, skottkuk@wp.pl wrote:
> But as for me, it would be logical to consider the construction inside {} as something whole,
For git the {} are just text, like anything else in your file.

Also, seeing the function as a whole, i.e. always give a conflict for 
any 2 changes within one function, is not wanted.
There a plenty of cases where 2 or more changes within the same (bigger) 
function are merged together, and expected to be merged.

For all else see the reply from Atharva Raykar.