Reintegrate can only be used if revisions X through Y were previously merged from to reintegrate the source, but this is not the case

后端 未结 11 1834
野的像风
野的像风 2020-12-04 05:54

Been using SVN branches with Tortoise 1.6. I\'ve been periodically merging the trunk into the branch to keep it up to date.

Today, I thought I\'d reintegrate the br

11条回答
  •  感动是毒
    2020-12-04 06:41

    Got this issue on

    • TortoiseSVN 1.9.7, Build 27907 - 64 Bit , 2017/08/08 19:34:38
    • Subversion 1.9.7, -release
    • apr 1.5.2
    • apr-util 1.5.4
    • serf 1.3.9
    • OpenSSL 1.0.2l 25 May 2017
    • zlib 1.2.8
    • SQLite 3.14.1

    right click on the branch where you wish to merge (but getting this message) and select the option "update to revision" and then on the dialog which opens (screenshot below) select those revisions and click ok - once all previous revisions are merged, you wouldn't get this message

    Adding this here to help someone who is using Tortoise SVN

提交回复
热议问题