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?