"resolves any merges upon checkin" is inaccurate and might scare people.
Here's my understanding of how it actually works:
Svn checkout = initial get
Svn update = subsequent get, merging changes into your working copy.
Conflicts (edits to the same areas of a text file) are resolved
Svn commit = check-in-and if you try to commit a file that was committed
since your checkout or last update, your commit fails, forcing you to
update and merge. You don't actually resolve merges when committing
(which is very dangerous to do!), you resolve them when updating.
From: Reedick, Andrew [mailto:jr9445_at_ATT.COM]
Sent: Thursday, April 03, 2008 8:12 AM
Subject: RE: Avoiding unexpected Concurrent Development
You don't checkout from Subversion. Instead, a subversion checkout is
more like a 'get'. Everyone 'gets' a copy of the files, works on them,
and then resolves any merges upon checkin.
The information transmitted is intended only for the person or entity to
which it is addressed and may contain confidential, proprietary, and/or
privileged material. Any review, retransmission, dissemination or other
use of, or taking of any action in reliance upon this information by
persons or entities other than the intended recipient is prohibited. If
you received this in error, please contact the sender and delete the
material from all computers. GA621
Received on 2008-04-03 16:48:49 CEST