Merging without whitespace conflicts

by 
 git merge -Xignore-all-space

Or (more precise)

 git merge -Xignore-space-change

should be enough to ignore all space related conflicts during the merge.

See git diff:

--ignore-space-change

Ignore changes in amount of whitespace.
This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent. 

--ignore-all-space

Ignore whitespace when comparing lines.
This ignores differences even if one line has whitespace where the other line has none.

ks1322 adds in the comments a good advice:

It is worth to merge with --no-commit and review the merge before actual commit.

The OP Callum Macrae reports that, in that case, the merge proceed uninterrupted, and the trailing spaces contained in the pull request patches are applied to the local files.
However, the OP uses a pre-commit hook which takes care of said trailing spaces.
(I suppose a bit similar to this one, also referenced here).

The OP’s pre-commit hook is referenced here:

In addition to removing trailing whitespace, it removes one to three spaces before tabs (I have tab width set to 4), and adds EOLs.
I’ve had reports that the code that adds the EOL deletes the file in windows, but haven’t been able to replicate it.

More Related Contents:

  1. I ran into a merge conflict. How can I abort the merge?
  2. What is the best (and safest) way to merge a Git branch into master?
  3. Is there a “theirs” version of “git merge -s ours”?
  4. How can I merge multiple commits onto another branch as a single squashed commit?
  5. Merge, update, and pull Git branches without using checkouts
  6. Re-doing a reverted merge in Git
  7. Is there a git-merge –dry-run option?
  8. When would you use the different git merge strategies?
  9. What’s the difference between ‘git merge’ and ‘git rebase’?
  10. How do I safely merge a Git branch into master?
  11. Add only non-whitespace changes
  12. I ran into a merge conflict. How do I abort the merge?
  13. What’s the simplest way to list conflicted files in Git?
  14. Git merge hotfix branch into feature branch
  15. Coloring white space in git-diff’s output
  16. Get changes from master into branch in Git
  17. Which version of the git file will be finally used: LOCAL, BASE or REMOTE?
  18. Git merge error “commit is not possible because you have unmerged files”
  19. Find unmerged Git branches?
  20. how can I customize git’s merge commit message?
  21. error: Your local changes to the following files would be overwritten by checkout
  22. git whitespace woes
  23. How do I fix a merge conflict due to removal of a file in a branch?
  24. Tell git not to merge binary files but to choose
  25. How to keep a branch synchronized/updated with master?
  26. How to merge specific files from Git branches
  27. git: merge two branches: what direction?
  28. Telling if a Git commit is a Merge/Revert commit
  29. Git merge branch into master
  30. How to quit (not abort) a Git merge in progress keeping the changes uncommitted?

Leave a Comment