It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

Merge conflict pop-up in SourceTree

When you merge a branch in SourceTree and there's a conflict, there's a pop-up that warns you about the conflict, and there's also a checkbox for never showing that pop-up again. I Accidentally checked it and now when I have a conflict I am not warned about it. Is there a way that i can reset that option so that I can be warned everytime there is a conflict?

1 answer

1 accepted

1 vote
Answer accepted

In a terminal, if you're using the direct version:

defaults write com.torusknot.SourceTreeNotMAS suppressConflictsWarning 0

And if you're using the Mac App Store version:

defaults write com.torusknot.SourceTree suppressConflictsWarning 0

Is there a reason this isn't available on the GUI under Preferences?

An oversight, I'll add it to the list.

How to do this in Windows version?

I know it's been 2 years, but I needed an answer to how to do this in Windows today, too, and am posting the answer here in hopes it'll help the next passerby.

The Windows folder %LocalAppData%\Atlassian\ contains one or more user.config files. Edit the one in the folder named for your version of SourceTree (2.1.2.5, in my case). It'll probably be the most recently changed one, too. Inside that user.config file is an XML node named SuppressConflictsWarning. Change its value to False and save the file.

 

<setting name="SuppressConflictsWarning" serializeAs="String">
    <value>False</value>
</setting>

 

I wrote up a bit more here, too: https://stackoverflow.com/questions/44812247/sourcetree-how-to-show-merge-conflicts-alert

 looked for that file, found it and the setting is not in that file

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Sourcetree

Sourcetree for Windows - CVE-2019-11582 - Remote Code Execution vulnerability

A vulnerability has been published today in regards to Sourcetree for Windows.  The goal of this article is to give you a summary of information we have gathered from Atlassian Community as a st...

4,935 views 0 12
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you