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?
Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...
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
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs