Perforce auto resolve from the command line?

前端 未结 3 1429
一生所求
一生所求 2021-02-19 20:41

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

3条回答
  •  时光取名叫无心
    2021-02-19 21:18

    I follow these steps, to do it from command line.

    1. In perforce client, Select the folder in workspace.
    2. Select File -> Open Terminal Window Here.Terminal will open in the same directory which is selcted in step 1.
    3. Perform a dry run using option -n :

    p4 resolve -c 1234 -n

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

提交回复
热议问题