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
I follow these steps, to do it from command line.
p4 resolve -c 1234 -n
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