SourceTree 3.0.8 removes mergetool and difftool settings in .gitconfig

[Rene Adomeit]

Hi, everytime I close SourceTree, it removes the mergetool and difftool settings from my .gitconfig file. This also happens when I start the application and immediately close it afterwards. This results in SemanticMerge not being available as external diff/merge tool.

My .gitconfig looks like this:

[user]
name = User
email = user@email.com
[gui]
[mergetool "sourcetree"]
cmd = 'C:/Users/myusername/AppData/Local/semanticmerge/semanticmergetool.exe' -s \"$REMOTE\" -d \"$LOCAL\" -b \"$BASE\" -r \"$MERGED\"
trustExitCode = true
[difftool "sourcetree"]
cmd = 'C:/Users/myusername/AppData/Local/semanticmerge/semanticmergetool.exe' -s \"$LOCAL\" -d \"$REMOTE\"
[filter "lfs"]
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
clean = git-lfs clean -- %f

Could you please check? Thanks

[jlewin]

I've also been seeing this recently. Every time I try to resolve a merge conflict it fails as the P4Merge path has been reset and I have to abort, go to Sourcetree settings, specify the path to P4Merge and restart to try again. Super frustrating

[armujahid]

This is a known bug and its also reported here: https://community.atlassian.com/t5/Sourcetree-questions/SourceTree-WIN-3-0-8-forgets-external-diff-tool-selection-on/qaq-p/932218

Atlassian team is working on a fix.