perforcep4v

Perforce auto resolve from the command line?

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:

  1. Right-click the CL.
  2. Choose "Resolve Files..." A dialog will appear.
  3. Choose "Merge yours and theirs if no conflicts exist".
  4. Click Auto.

Can someone translate this into a p4 command line command with correct arguments?

Solution

  • 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.