Git can ignore all space on merge. Is it possible to pass this option with SourceTree
git merge -Xignore-all-space
I created custom action that included ignore all white space shell script
https://github.com/benjaminpo/sourcetree-custom-action
You can't pass this to an individual merge call, but you can make it your default by setting this option in your local repositories .git/config:
branch.<name>.mergeoptions=ignore-all-space
As you can see you have to set it per-branch.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.