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?

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

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
Posted Jan 17, 2019 in Sourcetree

[dev team] Sourcetree for Windows 2019 Preview - Dark Theme

Hi folks, While the full post is over on our blog I'd like to share the dark theme we've got planned for 2019 here directly as well to keep the discussion going.  The ...

1,358 views 13 14
Join discussion

Atlassian User Groups

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!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you