Each type of conflict discussed in this section can occur during the upload phase or the download phase of merge processing.

• 此部分中讨论的每种类型的冲突都可能在合并处理的上载阶段或下载阶段发生。