Find centralized, trusted content and collaborate around the technologies you use most.
Teams
Q&A for work
Connect and share knowledge within a single location that is structured and easy to search.
当我使用应用程序 P4Merge 时,我对它的语言感到非常困惑。什么是“基础”、“源”、“目标”和“合并”?
它们如何对应于 Subversion 中使用的语言?它使用名称“base”、“theirs”、“mine”和“merged”
试试这个合并 UI 的描述:http ://www.perforce.com/perforce/doc.current/manuals/p4v/merging_files.html