You're on your way to the next level! Join the Kudos program to earn points and save your progress.
Level 1: Seed
25 / 150 points
1 badge earned
Challenges come and go, but your rewards stay with you. Do more to earn more!
What goes around comes around! Share the love by gifting kudos to your peers.
Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!
Join now to unlock these features and more
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:
name = User
email = email@example.com
cmd = 'C:/Users/myusername/AppData/Local/semanticmerge/semanticmergetool.exe' -s \"$REMOTE\" -d \"$LOCAL\" -b \"$BASE\" -r \"$MERGED\"
trustExitCode = true
cmd = 'C:/Users/myusername/AppData/Local/semanticmerge/semanticmergetool.exe' -s \"$LOCAL\" -d \"$REMOTE\"
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
clean = git-lfs clean -- %f
Could you please check? Thanks
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.