Add an option to not merge formatting automatically
I could not find an option to merge files manually when source has formatting and whitespace changes. These changes are lost after an auto-merge.
3
votes
Микола Моргун
shared this idea
-
Héber
commented
Hi,
There is an option in the preferences window where you can set the comparison method to ignore EOLs and whitespaces. It is in the Diff and Merge tab.
Is this what you wanted?Best,
Héber.