Ignore blank lines
Between methods different developers have different standards for number of blank lines (1 is correct, others use 2 or more). These show up in diffs, but they are not semantic differences.
42
votes
Michael Phipps
shared this idea
New SemanticMerge able to skip differences where only EOLs and indentation changed.
Check it out!
http://blog.semanticmerge.com/2014/04/new-semanticmerge-1061-is-out.html
-
Violeta
commented
A new release has been publish with support for this! Check it out!
-
Toby Herring
commented
There is an option for this in the merge tool, but:
a) it doesn't seem to work
b) it isn't sticky -
Mikhail Zagorny
commented
maybe it might be some option for this