But if there are conflicting changes, you must manually resolve the remaining conflicts by selecting a version of a model from which to accept changes.
但是如果有冲突性的变更存在，那么您就必须通过选择接受变更的模型的版本，来手动解决剩余的冲突问题。
If you have conflicting changes, you must then manually resolve the remaining conflicts by selecting a version of a model from which to accept changes.
如果你有产生冲突的变化，那么你必须手工解决剩下的冲突，选择接受哪一个版本的模型的变化。
The two users make some conflicting changes to the same model elements and diagrams.
这两个用户对同一个模型元素和图进行一些产生冲突的修改。
应用推荐