Book weirdness

[C. Michael Pilato]

Max Bowsher wrote:

> Luke Worth wrote:
>
>> Hi. I just wanted to point out that in chapter 3, in the section on work
>> cycle, in both 1.0 and 1.1 'svn merge' is listed under 'Merge others
>> changes' I was thinking maybe this should say 'svn update' instead?
>
>
> I think you are right.
> "svn merge" isn't exactly part of the "Basic Work Cycle".
>
> Book authors: Is it sufficient to just change this to "svn update", do 
> you think? Or is some clarification of that fact that "merging others' 
> changes" does not use "svn merge" needed?

Maybe we shouldn't say "merging others' changes", but something like 
"synchronize our working copy with the latest revision", or somesuch.  
(I don't have the relevant section in front of me to check flow with.)