创建新分支
svn cp -m "create branch" http://svn_server/xxx_repository/trunk http://svn_server/xxx_repository/branches/br_feature001
checkout 已有分支
svn co http://svn_server/xxx_repository/branches/br_feature001
合并chunk 代码到分支上
cd br_feature001
svn merge http://svn_server/xxx_repository/trunk
冲突解决
手动解决冲突后,执行
svn resolved filePath