Commits

zhaopingsun committed 4a7d5a6

5.6.0 transalted

Comments (0)

Files changed (1)

 "things for presentation here, we'd like the merge to fail immediately "
 "instead.  Here's one way we can do so."
 msgstr ""
+"正常情况下,如果这时我们运行<command role=\"hg-cmd\">hg merge</command>。它会"
+"运行一个GUI程序,让我们解决<filename>myfile.txt</filename>的冲突。但是,为了简"
+"化这里的演示,我们希望合并失败。我们可以按照下面的方法做。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch05-daily.xml:594
 "command> (which, as we desire, fails immediately) if it detects a merge that "
 "it can't sort out automatically."
 msgstr ""
+"我们告诉Mercurial的合并状态机,如果它检测到不能自己解决的冲突的话,就运行命令"
+"<command>false</command>(像我们希望的一样,立即失败返回)。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch05-daily.xml:599
 "Even if we don't notice that the merge failed, Mercurial will prevent us from "
 "accidentally committing the result of a failed merge."
 msgstr ""
+"即使我们没有注意到合并失败,Mercurial也会阻止我们意外地提交失败的合并结果。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch05-daily.xml:611
 "command> command.  As usual, <command role=\"hg-cmd\">hg help resolve</"
 "command> will print a helpful synopsis."
 msgstr ""
+"这种情况下,<command role=\"hg-cmd\">hg commit</command>失败的时候,它建议我们"
+"使用陌生的<command role=\"hg-cmd\">hg resolve</command>命令。和以前一样, "
+"<command role=\"hg-cmd\">hg help resolve</command>会输出帮助的摘要。"
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch05-daily.xml:618
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.