[svnbook commit] r3525 - * src/en/book/ch02-basic-usage.xml
codesite-noreply at google.com
codesite-noreply at google.com
Tue May 26 16:31:53 CDT 2009
Author: julianfoad at btopenworld.com
Date: Tue May 26 14:30:41 2009
New Revision: 3525
Modified:
trunk/src/en/book/ch02-basic-usage.xml
Log:
* src/en/book/ch02-basic-usage.xml
Use double spaces after sentence boundaries.
Patch by: Larry Shatzer, Jr. <larrys {_AT_} gmail.com>
Modified: trunk/src/en/book/ch02-basic-usage.xml
==============================================================================
--- trunk/src/en/book/ch02-basic-usage.xml (original)
+++ trunk/src/en/book/ch02-basic-usage.xml Tue May 26 14:30:41 2009
@@ -2296,7 +2296,7 @@
</footnote></para>
<para>But what happens if your collaborators move or delete a file
- that you are still working on? Maybe there was a miscommunication,
+ that you are still working on? Maybe there was a miscommunication,
and one person thinks the file should be deleted, while another
person still wants to commit changes to the file. Or maybe your
collaborators did some refactoring, renaming files and moving
@@ -2517,7 +2517,7 @@
svn: Aborting commit: 'code/bar.c' remains in conflict
</screen>
- <para>So how can this conflict be resolved? You can either agree
+ <para>So how can this conflict be resolved? You can either agree
or disagree with the move Harry made. In case you agree, you can
delete <filename>bar.c</filename> and mark the tree conflict as
resolved:</para>
More information about the svnbook-dev
mailing list