Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Celebration

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root

Avatar

1 badge earned

Collect

Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!

Challenges
Coins

Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.

Recognition
Ribbon

Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!

Leaderboard

Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,466,652
Community Members
 
Community Events
176
Community Groups

SourceTree 3.0.8 removes mergetool and difftool settings in .gitconfig

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

2 answers

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

Suggest an answer

Log in or Sign up to answer
TAGS

Atlassian Community Events