Merging (3/4)

• Like most commands, svn merge only affects your working copy

• This gives you a chance to inspect the merge and possibly modify it before committing: : jmglov@laurana; svn stat -u D 16 haiku.txt D 16 freeform.txt D 16 iambic-pentametre.txt A + - modern A + - post-modern/freeform.txt A + - post-modern A + - traditional/haiku.txt A + - traditional/iambic-pentametre.txt A + - traditional Status against revision: 16

Notes: