Perforce P4V中merge any
和merge down
之间有什么区别?当我尝试在Perforce中创建一个流时,我在高级设置/选项中看到了这两个选项。
答案 0 :(得分:0)
"合并任何"选项允许合并操作在任一方向(向上或向下)完成,而默认"合并向下"要求您只合并(并且必须复制而不是合并)。
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'.