P4V has been crapping out on me when attempting to resolve a large number of files as part of an integration. I want to be able to do this in the command line.
Here's the steps in P4V:
- Right-click the CL.
- Choose "Resolve Files..." A dialog will appear.
- Choose "Merge yours and theirs if no conflicts exist".
- Click Auto.
Can someone translate this into a p4 command line command with correct arguments?
You can use
p4 resolve -am [file ...]
which will skip the files with conflicts.If you specify a file, you will work on that file only. If you specify
...
, you will work on files below your working directory. If you do not specify a file, it will work on all of the files in your workspace.I do not have enough reputation to add a comment to the accepted answer so I'll add information in a new answer.
With Perforce 2013.2 you can indeed provide a changelist number to resolve to limit the operation to the files in that changelist.