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

Conflict dailog does not display, I tried to edit the SuppressConflictsWarning but can't find it

I've seen posts on where the config file is to set the SuppressConflictsWarning

But when I open the config file the setting is not there

Seriously if you can click on a check box to nut show this dialog again (and why would anybody even want to do this?) then there should be something in the settings to turn it back on

1 answer

0 votes
minnsey Atlassian Team May 17, 2018

Hi

On Sourcetree for Windows the setting is written to the user.config file.

It can be a bit tricky to find, it will be under the following folder

%localappdata%\Atlassian\Sourcetree\Sourcetree.exe_url_{hash}\{version}

where {version} matches the version of Sourcetree you are running and then you are looking for this:

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

and you want to set it to False.

Please read my posts more carefully:

"I've seen posts on where the config file is to set the SuppressConflictsWarning

But when I open the config file the setting is not there"

the xml

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

Does not exist in that file, should I add it?

minnsey Atlassian Team May 17, 2018

It is possible you have found a bug.

Checking that checkbox in the dialog, should set the SuppressConflictsWarning = true and it will only be persisted across re-starts if it is saved to the user.config, The default is SuppressConflictsWarning = false.

You can add that
entry to the user.config and that should force to show (false) or not (true)

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,894 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