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?
Rising Stars are recognized for providing high-quality answers to other users. Rising Stars receive a certificate of achievement and are on the path to becoming Community Leaders.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.