Cant resolve conflicts using their version in conflict resolution?

0
I recently merged changes (port fix) from another branch into the main branch of a group project, and was trying to resolve conflicts as usual. However, I only appear to be able to resolve using my document and not theirs, as I don't even have the option to use their document. Since the document is a newly imported document they created I obviously want to resolve using their version.     As you may see, the details of the conflict mention "The document that was changed in the repository, does not (yet) exist locally. Is there anything I can do to resolve this?   *Note: This is on version 10.7.0, although the latest version I can select seems to be 10.6.1.
asked
0 answers