[svnbook] r3807 committed - * src/en/book/ch01-fundamental-concepts.xml...
svnbook at googlecode.com
svnbook at googlecode.com
Thu Oct 21 16:14:10 CDT 2010
Revision: 3807
Author: cmpilato at gmail.com
Date: Thu Oct 21 14:13:47 2010
Log: * src/en/book/ch01-fundamental-concepts.xml
More index management.
http://code.google.com/p/svnbook/source/detail?r=3807
Modified:
/trunk/src/en/book/ch01-fundamental-concepts.xml
=======================================
--- /trunk/src/en/book/ch01-fundamental-concepts.xml Fri Oct 15 10:15:06
2010
+++ /trunk/src/en/book/ch01-fundamental-concepts.xml Thu Oct 21 14:13:47
2010
@@ -277,9 +277,7 @@
use a <firstterm>copy-modify-merge</firstterm> model as an
alternative to locking. In this model, each user's client
contacts the project repository and creates a personal
- <firstterm>working copy</firstterm>—a local reflection
- of the repository's files and directories, managed by the
- version control system. Users then work simultaneously and
+ working copy. Users then work simultaneously and
independently, modifying their private copies. Finally, the
private copies are merged together into a new, final
version. The version control system often assists with the
@@ -314,6 +312,10 @@
<graphic fileref="images/ch02dia5.png"/>
</figure>
+ <indexterm>
+ <primary>conflicts</primary>
+ </indexterm>
+
<para>But what if Sally's changes <emphasis>do</emphasis> overlap
with Harry's changes? What then? This situation is called a
<firstterm>conflict</firstterm>, and it's usually not much
More information about the svnbook-dev
mailing list