On 02/07/2021 18:25, skottkuk@xxxxx 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.
