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

SourceTree: suppressConflictWarnings fix on a Mac Edited

Hi -

I'm using SourceTree 3.2.1. I must have inadvertently clicked to suppress merge conflicts on a Mac because they're not showing up anymore. I found the answer to update the user.config in the AppData folder (https://community.atlassian.com/t5/Sourcetree-questions/Conflict-dailog-does-not-display-I-tried-to-edit-the/qaq-p/798376) on Windows but in my Mac I check here:

~/Library/ApplicationSupport/SourceTree.

There's no user config, only my cert, browser.plist, hgrc_sourcetree, ImageCache folder and openWindowList. None of which appear to have this property.

Where should I be looking to show the merge conflicts again. Any tips are greatly appreciated.

1 answer

1 accepted

0 votes
Answer accepted
bgannin Atlassian Team Jul 02, 2019

Hi @Matt Ganz,

Run the following command in Terminal:

defaults remove com.TorusKnot.SourcetreeNotMAS suppressConflictsWarning 

and then launch the app. That removes the preference value entirely, restoring you to the default (no pun intended.) 

Cheers,

Brian Ganninger
Principal Developer, Sourcetree

Where do I have to be? Whether I run this command from my home directory or Library/Preferences (where the com.TorusKnot.SourcetreeNotMAS is located) I get the following error: 

 

Domain (com.TorusKnot.SourcetreeNotMAS) not found.
Defaults have not been changed.

Are you sure it's not defaults delete....instead of remove? This deletes the domain. Or even this: 

defaults write com.torusknot.SourceTreeNotMAS suppressConflictsWarning 0
bgannin Atlassian Team Jul 02, 2019

That also works :)

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