IDEA 14 SVN merge from branch to trunk without reintegrate?
已回答
I want to merge a branch to trunk, so I fo a 'Merge from...', but doing this, a warning '... no longer usable for further work' appears... so It seems that it's trying to do a --reintegrate. But I don't want to reintegrate yet, I only want to select some revisions to merge.
Following the steps from here: https://www.jetbrains.com/idea/help/integrating-changes-to-from-feature-branches.html it looks like ot's possible, but the step 3 is not what's actually happening. When you click on 'Merge from...' and select the branch, the warning suddenly appears, no more choices.
Is there another path to reach what I'm trying to do?
Thanks in advance
请先登录再写评论。
The issue that there is no dialog allowing to choose "Merge All", "Quick Manual Select" or "Select With Pre-Filter" option could be connected to the svn working copy format or svn repository version. Please specify:
TBH I don't know the version on the server. I can only know the version of my working copy format, that is 1.8.
Please attach log file according to the comment in https://youtrack.jetbrains.com/issue/IDEA-151388.
Done!