Merge conflict pop-up in SourceTree

[Louis Boux]

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?

[stevestreeting · Accepted solution]

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

[Zteve]

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

[stevestreeting]

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

[joaoMaas]

How to do this in Windows version?

[Arin Friedlander]

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

[Richard Irwin]

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