Merging without whitespace conflicts

Question

I\'ve got a problem where I\'ve got a large commit which changes about a thousand lines of code, removing whitespace from the end of lines and removing spaces before tabs.

Answer 1

If you see that you have a lot of whitespace issues in a merge, you can simply abort it and do it again, this time with -Xignore-all-space or -Xignore-space-change. The first option ignores whitespace completely when comparing lines, the second treats sequences of one or more whitespace characters as equivalent.