Merge strategy for whitespace only changes?
I did a code format in master branch. It mainly fixed whitespace issues like: formatting tab space lengths, adds and removes newlines before and after braces. The problem is, when I try to merge master from other branches I get a lot of conflicts. Is there some strategy to bring in whitespace changes to other branches?
One Solution collect form web for “Merge strategy for whitespace only changes?”
From the docs of
git merge, I would assume that
git merge -s recursive -Xignore-space-change
could be used to achieve this. You might also want to play around with