SourceTree merge ignore whitespace conflicts

Question

Is there a way to tell SourceTree to always ignore whitespace "conflicts" during merges? Something like the command-line call:

git merge -Xignore-space-change

as described at Merging without whitespace conflicts.

Answer 1

SourceTree has an option for ignoring whitespace. It had added this option a couple of years back. You can visit this link for further info.

When in the File status or Log views, there's that gears dropdown below the file list (and right above the file changes). Click that and hit the Ignore whitespace option.

Hope this helps.