Re: Force Confirmation for Dropping Changed Lines

On Wed, Jan 25, 2017 at 2:16 PM, Hilco Wijbenga
[off-list ref] wrote:

How can I force Git to not assume my change to the first line is "redundant"?

My guess is that you probably want a custom merge driver for your file
types. That's where I would look initially.

Thanks,
Jake

Cheers,
Hilco

[1] Note that this someone is (correctly) using the same, new version of 1.3.
[2] If my example is actually incorrect, then please just pretend
there are no conflicts.