Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Deleted user
0 / 0 points
Next:
badges earned

Your Points Tracker
Challenges
Leaderboard
  • Global
  • Feed

Badge for your thoughts?

You're enrolled in our new beta rewards program. Join our group to get the inside scoop and share your feedback.

Join group
Recognition
Give the gift of kudos
You have 0 kudos available to give
Who do you want to recognize?
Why do you want to recognize them?
Kudos
Great job appreciating your peers!
Check back soon to give more kudos.

Past Kudos Given
No kudos given
You haven't given any kudos yet. Share the love above and you'll see it here.

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

Merge conflict pop-up in SourceTree

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?

1 answer

1 accepted

1 vote
Answer accepted

In a terminal, if you're using the direct version:

defaults write com.torusknot.SourceTreeNotMAS suppressConflictsWarning 0

And if you're using the Mac App Store version:

defaults write com.torusknot.SourceTree suppressConflictsWarning 0

Is there a reason this isn't available on the GUI under Preferences?

An oversight, I'll add it to the list.

How to do this in Windows version?

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 (2.1.2.5, 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

 looked for that file, found it and the setting is not in that file

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

3,261 views 4 5
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