I'm having problems using external merge tool (TortoiseMerge) with files with spaces in the file names.
If there is a conflict in a file and I choose Resolve Conflicts -> Launch External Merge Tool, the TortoiseMerge opens up but an error message comes up saying it can't find the file.
I have tried different options in Options -> Diff:
All have resulted in the same end result: TortoiseMerge can't open the files.
Files without spaces in names open up correctly.
I'm using SourceTree 1.5.2 on Windows 7.
I use TortoiseMerge 1.8.3 as my external merge tool (system default).
Hope someone can help me with this.
maybe this can help :
This is not really an Atlassian related problem so you might find more help on stackoverflow or so.
Hi, it's no necesary change another tool.
After tests, i found the problem.
The ":" used in params for open files in TortoiseGitMerge had a stranged bug.
To solve, i set "Custom" in "Diff Toll" option at SourceTree, set the dir for TortoiseGitMerge and put this custom commands:
-base \"$BASE\" -mine \"$LOCAL\" -theirs \"$REMOTE\" -merged \"$MERGED\"
TortoiseGitMerge run normally without ":"
The problem has solved. :)
Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...
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