把主干代码merge到
1: checkout targetURL cd到其目录
2: svn merge sourceURL targetURL
3:sudo svn st | grep "! "| xargs sudo svn resolved
4:svn commit
5: svn merge sourceURL 本地目录
时间: 2024-08-07 11:22:19
把主干代码merge到
1: checkout targetURL cd到其目录
2: svn merge sourceURL targetURL
3:sudo svn st | grep "! "| xargs sudo svn resolved
4:svn commit
5: svn merge sourceURL 本地目录