Book weirdness

[Ben Collins-Sussman]

On May 16, 2005, at 2:07 PM, C. Michael Pilato wrote:
>
> 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.)
>

Maybe "accepting others' changes"?  It's very simple language, and  
describes the section about updates and conflict resolution.