I'm trying to setup Devart Code compare as the merge tool.
The documentation of Devart Code compare states that it required the following:
/TF="path to remote" /MF="path to local" /BF="path to base" /RF="path to merged"
When I translate this to the argument to be entered in Sourcetree, whtis would be:
/TF="$REMOTE" /MF="$LOCAL" /BF="$BASE" /RF="$MERGED"
However, when I that what is actually being executed, I see that the command line is (I'm trying to merge my Gitignore file):
"c:\Program Files\Devart\Code Compare\CodeMerge.exe" "C:/Program Files (x86)/Git/TF=./.gitignore.REMOTE.1120.gitignore" "C:/Program Files (x86)/Git/MF=./.gitignore.LOCAL.1120.gitignore" "C:/Program Files (x86)/Git/BF=./.gitignore.BASE.1120.gitignore" "C:/Program Files (x86)/Git/RF=.gitignore"
The backslahes seem to have been replaced with the paths to Git. When I try to escape the backslag with another backslash, I get:
"c:\Program Files\Devart\Code Compare\CodeMerge.exe" "//TF=./.gitignore.REMOTE.1120.gitignore" //MF=./.gitignore.LOCAL.1120.gitignore //BF=./.gitignore.BASE.1120.gitignore //RF=.gitignore"
which doesn't work either.
Is there anything I can do to correct the argument that needs to be passed as forward slash?
Badges are a great way to show off community activity, whether you’re a newbie or a Champion.Learn more
Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs