sirk-c
9/26/2014 - 5:52 PM

Subversion

Subversion

Basic merge
svn merge ^/trunk -r188:HEAD

Remove subversion files from directory
cd to root location
find . -type d -name .svn -exec rm -rf {} \;

Errpr "Cannot merge into mixed-revision working copy [76:78]; try updating first"
svn update --ignore-externals
Ref: 
http://stackoverflow.com/questions/17166209/svn-always-ignore-externals-when-performing-an-svn-up