opendiff don't work

at merge any file

i see in console

opendiff: %MyFile%.m.BASE.%Number%.m does not exist

how fix it ?

in preferences diff select fileMerge

4 answers

instead that in the folder I see only %MyFile%.m.orig

rights to read / write in the folder is for all

it does not create any of the

BACKUP

BASE

LOCAL

REMOTE

but I see them in other branches at other marge

Please read carefully

SourceTree finds opendiff(!) and open it

but immediately closes, because

opendiff: %MyFile%.m.BASE.%Number%.m does not exist (log in console)


but he had enough strength to create a file %MyFile%.m.orig

If this is git, your ~/.gitconfig might help

I don't know where it's getting all those % signs from, that looks like a Windows parameter (unless your files actually have % characters in their names).

omg =)

opendiff: %MyFile%.m.BASE.%Number%.m does not exist

same as

example

opendiff: \PathName\Folder\Filename.m.BASE.92993.m does not exist

You are a developer SourceTree?

You know as configured file name with merge?

how I can just get in contact with the developers?

-------

This problem only occurs on some merge

not every time

but if there is, it is any file not is merge

because of an error, which I have indicated above


I am the developer of SourceTree. In order for me to assist you, you'll need to answer the questions I asked, i.e. whether this is git, and if so, what the contents of your ~/.gitconfig file is.

The reason is that your errors indicate that you are using git configuration files from a Windows machine which are overriding the ones that SourceTree creates. The '%' characters and backslashes in the file name ('\') are what give this away, the Mac never uses % characters for parameters, and always uses forward slashes for directories. I'm assuming you use Windows too, or someone on your team does which has caused Windows-style config entries to appear on your machine.

Suggest an answer

Log in or Join to answer
Community showcase
Brian Ganninger
Published Jan 23, 2018 in Sourcetree

Tip from the team: workflow and keyboard shortcuts

Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...

245 views 0 3
Read article

Atlassian User Groups

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!

Find my local user group

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

Groups near you
Atlassian Team Tour

Join us on the Team Tour

We're bringing product updates and pro tips on teamwork to ten cities around the world.

Save your spot