cd branch
svn up
svn merge https://abc.com/app/trunk/myapp
svn ci -m 'merge brunk'
cd trunk
svn up
svn merge https://abc.com/app/branches/myapp_BRANCH
svn ci -m 'merge branch'
编辑文件，进行修改
svn resolve file
svn resolve --accept working -R .
svn revert --depth=infinity .
alias sst="svn st | grep -v Runtime | grep -v Uploads | grep -v .buildpath | grep -v .settings "
alias sdiff="svn diff "
alias sup="svn up"
alias srevert="svn revert"
alias sci="svn ci"
alias sinfo="svn info"
alias sdel="svn del"
alias sco="svn co"
alias slog="svn log -v | more "
alias srevertall="svn revert --depth=infinity . "
alias smerge="svn merge "
alias sresolve="svn resolve "
alias sadd="svn add "
alias scopy="svn copy "
使用使用门槛低，比较方便，必须联网提交，git不联网也可以提交，很多团队都在转向git ,后续再整理下git的。