Commits

zhaopingsun committed ef0d54c

3.2 first para zh translated

Comments (0)

Files changed (1)

 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch03-tour-merge.xml:196
 msgid "Merging conflicting changes"
-msgstr "合并有冲突的变"
+msgstr "合并有冲突的变"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch03-tour-merge.xml:198
 "emphasis>, where you have to decide how to reconcile the different changes "
 "into something coherent."
 msgstr ""
+"大多数合并都很简单,但有时候你会发现待合并的不同变更修改了同一文件的相同部分。"
+"除非修改完全一致,否则合并会出现<emphasis>冲突</emphasis>,这时候你就要决定如"
+"何在不同的变更中取舍,最后形成一致的结果。"
 
 #. type: Content of: <book><chapter><sect1><figure><title>
 #: ../en/ch03-tour-merge.xml:206