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

[Richard Irwin]

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

[minnsey]

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.

[Richard Irwin]

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]

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)