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 1825
野的像风
野的像风 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:49

    Something that worked for me in tortoise SVN: instead of merging all revisions from branch, choose specific range and manually select all your revisions from the branch.

提交回复
热议问题