svn merge后两个文件状态是什么意思？
What's the meaning of the two file status after svn merge?
在我的 t运行k 工作副本中，我 运行 svn merge -r 41324:41557 branch_url，并得到以下输出：
--- Merging r41325 through r41557 into '.':
U KfClient\ctimclientapp.cpp
U KfClient\util\utility.cpp
C KfClient\chat\group_service\src\domain\group_member\groupkf.cpp
C KfClient\chat\group_service\src\domain\group_member\groupkf.h
C KfClient\resources\docs\version_log.txt
为什么有两个状态标记列，它们是什么意思？例如，C可能出现在第一列或第二列。
来自svn help merge：
Characters in the first column report about the item itself.
Characters in the second column report about properties of the item.
A 'C' in the third column indicates a tree conflict, while a 'C' in
the first and second columns indicate textual conflicts in files and
in property values, respectively.
在我的 t运行k 工作副本中，我 运行 svn merge -r 41324:41557 branch_url，并得到以下输出：
--- Merging r41325 through r41557 into '.':
U KfClient\ctimclientapp.cpp
U KfClient\util\utility.cpp
C KfClient\chat\group_service\src\domain\group_member\groupkf.cpp
C KfClient\chat\group_service\src\domain\group_member\groupkf.h
C KfClient\resources\docs\version_log.txt
为什么有两个状态标记列，它们是什么意思？例如，C可能出现在第一列或第二列。
来自svn help merge：
Characters in the first column report about the item itself.
Characters in the second column report about properties of the item.
A 'C' in the third column indicates a tree conflict, while a 'C' in
the first and second columns indicate textual conflicts in files and in property values, respectively.