SourceTree Merge Ignores Space Conflicts

Question

Is there a way to tell SourceTree to always ignore whitespace “conflicts” during mergers? Something like a command line call:

git merge -Xignore-space-change 

as described in Combining No Conflicts Spaces .

Answer 1

SourceTree has the ability to ignore spaces. He added this option a couple of years ago. You can visit this link for more information.

When the file status or log view displays a drop-down list of transfers below the list of files (and directly above the file). Click this button and click the Ignore Spaces button.

Hope this helps.

Answer 2

Merging with the source text to ignore conflicts with spaces can be performed using custom actions.

I created a custom script action wrapper that performs similar actions, but ignores all the space that I use every day, but you can change the line of script line 8 git merge parma from -Xignore-all-space to -Xignore-space-change to she matched in your case. You can load the custom action sourcetree script - combine ignore empty space , call the script in your sourcetree and pass the $SHA parm

For the difference -Xignore-all-space and -Xignore-space-change you can refer to the official git extended merge book and git Merge the answer skip the space here