perforce - P4V：在 perforce 流中合并和合并任何内容有什么区别

Question

merge anyPerforce P4V和merge downin Perforce P4V有什么区别？当我尝试在 Perforce 中创建流时，我在Advanced settings/options中看到了这两个选项。

Answer 1

“合并任何”选项允许在任一方向（向上或向下）进行合并操作，而默认的“向下合并”要求您只向下合并（并且必须向上复制而不是向上合并）。

https://www.perforce.com/perforce/doc.current/user/relnotes.txt：

#963443 (Bug #65298, #74627) **
    The new 'mergeany' stream option allows flow rules for 'p4 merge'
    to be ignored for a particular stream.  The default option of
    'mergedown' preserves the previously existing flow rules.  Streams
    created by 'p4 switch' on a personal server use 'mergeany'.