如何在Perforce JAVA API中解析集成文件 [英] How to resolve integrated files in Perforce JAVA API
问题描述
如何解决Perforce JAVA API中的集成文件。我正在尝试将文件从一个分支合并到另一个分支。我正在使用以下代码进行合并。
How to resolve integrated files in Perforce JAVA API. I am trying to merge files from one branch to another. I am using following code to merge.
tmpClient.integrateFiles(file, toFile, "17.2", opts );
执行此命令后，需要解析文件。我该怎么做？
After executing this command, files need to be resolved. How can I do that?
推荐答案
查看IClient.resolveFile（）和IClient.resolveFilesAuto（）：
Look at IClient.resolveFile() and IClient.resolveFilesAuto():
您使用的具体方法取决于您是否希望始终能够依赖自动解析（这通常是一个不好的期望）以及您在应用中处理的系统类型冲突的合并。
The specific method you use will depend on whether you expect that you will always be able to rely on auto-resolve (which is a bad expectation generally) and what sort of system you have in your app to handle conflicting merges.
这篇关于如何在Perforce JAVA API中解析集成文件的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！
