改变或冲突？
It then compares the two delta sets to create a list of conflicts that must be resolved by accepting one or the other incoming changes.
然后该工具会比较两个delta集合，以创建冲突的列表，这些冲突必须通过接受一个或者其他到来的变更来得到解决。
When changes are made to files in the repository by a different developer, the SCM can identify conflicts from your changes and either automatically merge them or notify you of the conflict.
其他开发人员更改了存储库中的这些文件后，SCM会标识出这些变更与您所做的变更之间存在的冲突，然后自动将其合并或通知您存在冲突。
As a result, someone will have to resolve the conflicts if and when the changes ever need to be integrated into the same stream or repository workspace.
因此，人们不得不在需要将变更集成到相同的流或存储库工作区中时解决冲突。
As a result, someone will have to resolve the conflicts if and when the changes ever need to be integrated into the same stream or repository workspace.
因此，人们不得不在需要将变更集成到相同的流或存储库工作区中时解决冲突。
应用推荐