zhaopingsun avatar zhaopingsun committed a729ab2

3.1 first 5 paras zh transated

Comments (0)

Files changed (1)

 # Authors:
 # Dongsheng Song <dongsheng.song@gmail.com>, 2009
+# Zhaoping Sun <zhaopingsun@gmail.com>, 2009
 # Check translation:
 #    msgfmt --statistics -c -o zh.mo zh.po
 "pulling or pushing changes from one repository into another.  Our next step "
 "is <emphasis>merging</emphasis> changes from separate repositories."
 msgstr ""
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch03-tour-merge.xml:13
 "Merging is a fundamental part of working with a distributed revision control "
 "tool.  Here are a few cases in which the need to merge work arises."
 msgstr ""
 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
 #: ../en/ch03-tour-merge.xml:20
 "feature in his.  They want the shared repository to contain both the bug fix "
 "and the new feature."
 msgstr ""
 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
 #: ../en/ch03-tour-merge.xml:27
 "once, each safely isolated in its own repository. Working this way means that "
 "she often needs to merge one piece of her own work with another."
 msgstr ""
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch03-tour-merge.xml:35
 "through a merge.  We'll begin by cloning yet another repository (see how "
 "often they spring up?)  and making a change in it."
 msgstr ""
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch03-tour-merge.xml:42
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.