I have the following setup in SVN 1.6:
- Branch1 created from trunk
- Branch2 created from Branch1
When I try to bring Branch2 up-to-date by merging changes from Branch1, IDEA gives me the error message:
You are going to reintegrate changes.
This will make https://foo.com/local/foo/branches/Branch1 no longer usable for further work.
Are you sure?
I click "Cancel" since am most definitely not reintegrating a branch; development needs to proceed on both Branch1 and Branch2. I am clicking "Merge from..." on the "Subversion Working Copies information" tab to perform this merge.
This works successfully when I bring Branch1 up-to-date by merging changes from the trunk. I can also bring Branch2 up-to-date by merging changes from Branch1 successfully with TortoiseSVN or the svn command line.
Any idea why I cannot merge changes from Branch1 to Branch2 within IDEA?
I am running IDEA Ultimate 10.5.2.