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

Why cannot I mark a conflicted file as unresolved in SourceTree?

Julius Niiniranta Oct 20, 2016

I'm trying to resolve conflicts in a rebase process. I selected a conflicted file and started resolving it with Apple's FileMerge, but had to quit without saving changes. For some reason SourceTree marked the file as resolved. I want to mark it as unresolved, but the option is disabled. Why? How can continue resolving it?

1 answer

0 votes
Seth Oct 20, 2016

Try choosing "Restart Merge" in the right-click menu for that file.

Suggest an answer

Log in or Sign up to answer
This widget could not be displayed.
This widget could not be displayed.
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...

393 views 0 9
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