Team Project could not resolve the conflict

[Yijia5C0E]

We are wokring on a Team Project. After I relinked several footage and my co-worker deleted them ,we encountered a conflict. Even though I tried each option like take the share version or keep my version, the conflict could not be solved. And I couldn't share my version without solving this conflict. It's like a dead circle. 

[Ged_Traynor]

Moving thread to the Team Projects forum from Using the Community

[R Neil Haugen]

They've implemented a new process for Team Projects linking, but it might still be in the Public Beta version. That will simplify linking and relinking.

The current version still works best when ONLY the "creator" of the project uses the Media Browser or Project panels to link or add media.

ALL other users must use the Edit/Team Projects/Media Management dialog to link to media on their machine.

Neil