This conflict can be resolved by loading the newer version of the document, reapplying the edits and trying to save again.
可以通过加载更新版本的文档来解决该冲突，然后重新进行编辑并再次保存。
You can then install a new version (either from source code or from a binary package) without fear of conflict between the two versions.
然后您可以（通过源代码或二进制软件包）安装一个新版本，而无需担心两个版本之间有冲突。
Americans did not invent new methods of drastic war during the Civil war so much as they made real a version of conflict many of them had talked about from the start.
美国人在内战中没有发明多少激烈战斗的新方法，但是他们将最初讨论中的多种冲突方式付诸实践。
In order to avoid a sloppy conflict in the first module version, xml_objectify now "mangles" the names of the class templates for XML nodes.
为了避免第一个模块版本中草率的冲突，xml_objectify现在对xml节点的类模板名称做了“大改动”。
Resuming the suspended change causes a conflict because Jazz doesn't know which version to select: S2 or S3?
恢复悬挂的变更导致了冲突，因为Jazz不知道选择哪个版本：S2或者S3 ？
An extra column can be used in the database to hold a version or a timestamp (see Resources for more information on conflict handling techniques).
在数据库中可以使用额外的一列来保存版本或时间戳(参见参考资料部分以获取关于冲突处理技术的更多信息)。
For example, if you're packaging a modified version of apache, you won't want the normal version of apache to be on the system as well as yours — so "apache" would be listed as a conflict.
例如，如果您对修订版apache进行打包，那么您不希望正常版本的apache与您的修订版本都处于一个系统上—因此“apache”将被列为冲突。
For instance, back integration from a 'correction' branch to the 'development' branch always brings up a conflict, even though the development branch version was never modified.
比如说，从‘更正’分支到‘开发’分支的反向整合总会带来冲突，即使开发分支版本从来没有进行过修改。
This is used to decide whether or not a conflict must be reported when the next version from SAP is received.
这个功能用于判断当SAP发送的下一个版本被接收时，是否必须记录冲突。
"So if the upgrade contains a new version of a file which the customer has modified, a conflict is reported, right?" she asked.
“如果在升级中包括了文件的客户修改版本，就会报告冲突，对吧？”她问道。
In the event of any conflict between translated versions, the English version shall in all cases prevail.
若英语版本与翻译版本有任何不一致之处，以英语版本为准。
The introduction of foreign films have a double version of the film copyright protection conflict, which according to China's existing laws can not be solved.
境外电影作品的引进产生双重版电影版权的保护冲突问题，对此依我国现行法律无法实现对境外电影作品版权的合理保护。
The self-description is the key to program model simplification, multi-language integration, type safety and solving version conflict.
这种特性对于简化编程模型、提供多语言集成、实现类型安全和解决版本冲突等许多方面都具有重要的意义。
Merge from one branch to another, a conflict can occur between the version of the file in the source branch and the version of the file in the target branch.
从一个分支合并到另一个分支时，源分支中的文件版本与目标分支中的文件版本之间可能发生冲突。
No. When you resolve a conflict in DTR, the merge arrow is persisted, and propagated along with the merged version that was created.
如果已经解决了冲突，合并的冲突点被记录，伴随这个合并版本将创建传播。
So if the upgrade contains a new version of a file which the customer has modified, a conflict is reported, right?
如果在升级中包括了文件的客户修改版本，就会报告冲突，对吧？
Get or check in a file, a conflict can occur between the version in your workspace and the version on the server.
获取或嵌入文件时，工作区中的版本与服务器上的版本之间可能发生冲突。
However, if there is any conflict, ambiguity or discrepancy between the Chinese version and a version in other language, the Chinese version shall prevail.
但是，如果本协议的中文文本和其他文本之间存在矛盾，歧义或者不一致之处，则以中文本为准。
However, if there is any conflict, ambiguity or discrepancy between the Chinese version and a version in other language, the Chinese version shall prevail.
但是，如果本协议的中文文本和其他文本之间存在矛盾，歧义或者不一致之处，则以中文本为准。
应用推荐