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?

  • AnkhSVN client side pre-commit hook
  • Is there a text editor that will “pretty print” for display without changing the underlying text?
  • Committing when changing source formatting?
  • What is a good way to manage cleanup commits in git for a legacy project?
  • automated code formatting git
  • How to auto-format Java code
  • Using same git repository by multiple users
  • How to move a file from one git repository to another while preserving history
  • How do I merge local modifications with a git stash without an extra commit?
  • Git alias to delete remote branch
  • What's the correct organisation for Go projects using Git (or any VCS)?
  • Git Push Hangs After a Few Pushes
  • 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

    • -Xignore-all-space or
    • -Xignore-space-at-eol
    Git Baby is a git and github fan, let's start git clone.