Created a branch from a tagged version of a branch, but merging is not possible
I have a branch 2.0-support from main line. On branch 2.0-support I made a versioned package. Some days later I created a branch z of the tagged package. After some work in branch z I want to merge it back to branch 2.0-support. But that seems to be impossible. I can only merge branch z to the main line. Shouldn't it be possible to merge this branch z to branch 2.0-support? Because z is created from a tagged version of branch 2.0-support? Note: in the mean while I tried to create a branch from a branch and then merge back, but that isn't possible too!
Merging from branch line to branch line was introduced in 3.1.0. The merge form was a little buggy there, though, so I would recommend switching to 3.2.x instead.
Arjan van IJzendoorn
How exactly is it not possible?
When I have my branch open and select Merge changes here... and select Advanced Merge, I can select a branch and revisions to merge.
Do you mean you get an error? I do believe the merge is/was broken in 3.1.1.