[svnbook] r5585 committed - trunk/en/book/ch02-basic-usage.xml

richardcavell at users.sourceforge.net richardcavell at users.sourceforge.net
Sun Jan 14 12:56:57 CST 2018

Revision: 5585
Author:   richardcavell
Date:     2018-01-14 18:56:57 +0000 (Sun, 14 Jan 2018)
Log Message:
Modify chapter 2's description of svn status output

After discussion on the mailing list, there is some consensus that
"conflict" is a better word than "overlap" for this sentence.

Modified Paths:

Modified: trunk/en/book/ch02-basic-usage.xml
--- trunk/en/book/ch02-basic-usage.xml	2018-01-14 02:04:21 UTC (rev 5584)
+++ trunk/en/book/ch02-basic-usage.xml	2018-01-14 18:56:57 UTC (rev 5585)
@@ -1324,7 +1324,7 @@
         repository.  One marked with
         <computeroutput>G</computeroutput> had local changes to begin
         with, but the changes coming from the repository didn't
-        overlap with those local changes.</para>
+        conflict with those local changes.</para>
       <para>It's the next few lines which are interesting.  First,
         Subversion reports to you that in its attempt to merge

More information about the svnbook-dev mailing list