仅当修订[…]以前已从中合并时,才能使用“重新整合”svn://... 重新整合来源:哪个来源?
为了重新整合其他开发人员的更改,我尝试将生产分支合并到开发分支中,但出现以下错误:仅当修订[…]以前已从中合并时,才能使用“重新整合”svn://... 重新整合来源:哪个来源?,svn,merge,tortoisesvn,Svn,Merge,Tortoisesvn,为了重新整合其他开发人员的更改,我尝试将生产分支合并到开发分支中,但出现以下错误: Command: Auto-merge svn://10.33.1.1/myPortail/branches/preproduction into F:\Web\myPortail\branches\branche1 Error: Reintegrate can only be used if revisions 239 through 359 were previously Error: merged
Command: Auto-merge svn://10.33.1.1/myPortail/branches/preproduction into F:\Web\myPortail\branches\branche1
Error: Reintegrate can only be used if revisions 239 through 359 were previously
Error: merged from svn://10.33.1.1/myPortail/branches/branche1 to the
Error: reintegrate source, but this is not the case:
Error: branches/preproduction
Error: Missing ranges:
Error: /branches/pre_prod:286,288-289,292,294,296,300,302,305,308,310,314,317,322-323,325,331,339,341,343,345,347,349,351,353,356,358
Error:
Error: branches/preproduction/src/Module/Admin/views/ccManagment/ccEdit.twig
Error: Missing ranges:
Error: /branches/preproduction/src/Module/Admin/views/ccManagment/ccEdit.twig:286,322
我想试一下,但我不知道哪个分支应该合并到哪个分支中
我在理解错误消息后执行以下合并:
svn merge -r 239:359 svn://10.33.1.1/myPortail/branches/branche1 preproduction
但它并没有改变什么。。。您如何理解该错误,以及我需要从何处合并到