Perforce auto resolve from the command line?
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.
p4 resolve -c changelist#
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 follow these steps, to do it from command line.
- In perforce client, Select the folder in workspace.
- Select File -> Open Terminal Window Here.Terminal will open in the same directory which is selcted in step 1.
- Perform a dry run using option -n :
p4 resolve -c 1234 -n
- To accept automatic merge from perforce use -am option,
Automatic Mode. Automatically accept the recommended file revision: if theirs is identical to base, accept yours; if yours is identical to base, accept theirs; if yours and theirs are different from base, and there are no conflicts between yours and theirs; accept merge; otherwise, there are conflicts between yours and theirs, so skip this file.
p4 resolve -c 1234 -am