${PREV_TITLE} Concurrent Versions System ${NEXT_TITLE}
Other's changes and Conflicts
  • Updating your working copy
    $ cvs update
  • When do conflicts occur?
  • Resolving conflicts 
     <<<<<<< (filename)
   your changes
 =======
   the new changes that came from 
   the repository
 >>>>>>> (latest rev. no. in repository)