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:
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.
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.)
Principal Developer, Sourcetree
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...
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