Perforce 自动解析总是接受目标

Perforce auto resolve always accept target

我记得有一个设置,它总是会自动解析并接受目标而无需用户交互。但是我忘记了这是服务器选项还是客户端选项,不知道如何设置它。

-ay 添加到 resolve 命令以接受目标(“您的”)。

p4 help resolve:

        The -ay flag resolves all files by accepting yours and ignoring
        theirs. It preserves the content of workspace files.