Commits

zhaopingsun committed 56f322b

5.6.0 some para

  • Participants
  • Parent commits 70aab97

Comments (0)

Files changed (1)

 "Let's develop a simple case of this and see how to deal with it.  We'll start "
 "off with a repository containing one file, and clone it twice."
 msgstr ""
+"我们用一个简单的例子看看如何处理这种情况。我们将包含一个文件的版本库克隆两次。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch05-daily.xml:568
 msgid "In one clone, we'll modify the file in one way."
-msgstr ""
+msgstr "在第一个克隆中,我们将文件修改成这样。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch05-daily.xml:572
 msgid "In another, we'll modify the file differently."
-msgstr ""
+msgstr "在另外一个克隆中,我们做完全不同的修改。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch05-daily.xml:576
 msgid "Next, we'll pull each set of changes into our original repo."
-msgstr ""
+msgstr "接下来,我们将两个变更集都推到原始的版本库。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch05-daily.xml:581
 msgid "We expect our repository to now contain two heads."
-msgstr ""
+msgstr "我们希望版本库现在有两个头版本。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch05-daily.xml:585