但是如果有冲突性的变更存在，那么您就必须通过选择接受变更的模型的版本，来手动解决剩余的冲突问题。

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.

youdao

如果你有产生冲突的变化，那么你必须手工解决剩下的冲突，选择接受哪一个版本的模型的变化。

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.

youdao

冲突必须在很大的深度范围内得到检查和解决，尤其是在范例模型方面。

Conflicts must be examined in great depth and are generally resolved in favor of the exemplar models.

youdao