nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

Merge conflict pop-up in SourceTree

Louis Boux

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?

Accepted answers

stevestreeting

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

All comments

stevestreeting

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

Zteve1

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

stevestreeting

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

joaoMaas

How to do this in Windows version?

Welcome!

It looks like you're new here. Sign in or register to get started.

Quick Links

Find more posts tagged with

sourcetree