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?

  • Git modify contents of index directly for pre-commit formatting hook
  • Code Tidy vs Source Control (Monotone or Git)
  • AnkhSVN client side pre-commit hook
  • Code formatting before commit to GIT
  • Script to rebuild git history, applying code cleanup to every version
  • Are there any free cmd-line scripts which can re-format PHP source-code?
  • can ssh-add be added globally
  • Git workflow in the context of multiple unit-test suites
  • git pull and reset stopped by error “unable to create file <filename> (File exists)”
  • Jenkins Git Plugin: Failed to connect to repository, returned status code 128
  • SSH-Keygen “no such file or directory”
  • Create a new BitBucket repository for existing files from Ubuntu
  • 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.