我尝试从生产分支合并到开发分支,以便重新集成其他开发人员的更改,但是我收到以下错误:
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
我想从SO尝试this answer,但我不明白应该将哪个分支合并到哪个分支。
我执行以下合并,因为我理解错误消息:
svn merge -r 239:359 svn://10.33.1.1/myPortail/branches/branche1 preproduction
但它什么都没改变......你如何理解错误以及我需要在哪里合并?