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?
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 (188.8.131.52, 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
Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
We're bringing product updates and pro tips on teamwork to ten cities around the world.Save your spot