Merging (2/4)

Now carry out the merge: : jmglov@laurana; svn merge -r 13:16 \ file:///home/jmglov/svnroot/\ test-new-project/branches/BLEEDING_EDGE A modern A post-modern A post-modern/freeform.txt A traditional A traditional/haiku.txt A traditional/iambic-pentametre.txt D haiku.txt D freeform.txt D iambic-pentametre.txt
You can also use the HEAD revision, but I don't recommend it, for a reason that you will see in a couple of slides

You can also use the HEAD revision, but I don't recommend it, for a reason that you will see in a couple of slides