File:Svn merge general.jpg

schematic showing a merge, including the working copy and changeset