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?

  • automated code formatting git
  • Are there any free cmd-line scripts which can re-format PHP source-code?
  • How to auto-format Java code
  • AnkhSVN client side pre-commit hook
  • Code formatting before commit to GIT
  • Script to rebuild git history, applying code cleanup to every version
  • git port - network requirement
  • Is Git's stashing mechanism essentially creating commit and then cherry-picking it?
  • How to get pub from GitHub as a dependency
  • Sync all branches with git
  • What would make git delete local files during git pull --rebase?
  • .gitignore is refusing to ignore a folder
  • 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.