今天准备将分支代码合并主干,直接用的TortoiseSVN工具合并。按照上篇文章所说《svn分支开发与主干合并(branch & merge)》,首先我要将主干代码同步到本地branch,结果报出了如下错误:
Command: Auto-merge http://svn.yihaodian.com/svn/source/yihaodian/BYR/BYR-1/backend-cms/trunk into D:\合并代码专用文件夹\backend-cms-dev-20170510
Error: Reintegrate can only be used if revisions 1810724 through 1817361 were
Error: previously merged from
Error: http://svn.yihaodian.com/svn/source/yihaodian/BYR/BYR-1/backend-cms/branches/backend-cms-dev-20170510
Error: to the reintegrate source, but this is not the case:
Error: source/yihaodian/BYR/BYR-1/backend-cms/trunk
Error: