I have strange behavior of SourceTree on windows. I have configured diff/merge to Diffmerge. On first computer it works but on second one Sourcetree is generating helper files (BACKUP, BASE, LOCAL, REMOTE) but diffmerge is not executed? Another thing is that on first machine after resolving all conflicts Sourcetree keep some of these helper files on disk (I have to delete it manually)
I have reinstalled windows and now I have only one problem :) After successful merge of some file - for instance file.ext there is another file in solution file.ext.orig and current branch is in ‘Uncommitted changes’ – I have to delete this file manually to complete merge.
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
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs