Git merge ignore spaces [duplicate]

Answer 1

Try:

$ git merge -s ignore-all-space

For more details:

$ git help merge
/whitespace

Answer 2

You can try setting the core.whitespace config to see if that helps.