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?
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.
来源：https://stackoverflow.com/questions/38562749/how-to-resolve-integrated-files-in-perforce-java-api