I have created a branch of a branch. For example I've branched the trunk project “Sandbox” to “Branch 1”. And then I've branched “Branch 1” to “Branch 2”, like the image below:
Then I start a merge session: merge branch 1 into the trunk. Then I want to merge branch 2 back into the trunk. However, it's not showing up by default in the merge session:
I can only select the recently merged “Branch 1” in “Branch project”, not the “Branch 2”. However, I can select the “Branch 1” as “Trunk project” when I remove some prefilters. Then I can merge Branch 2 into branch 1, and then merge branch 1 into the trunk.
Is this intended and safe to do?
I would expect I could merge branch 2 directly into the trunk as branch 1 is already merged.
What I actually want to do is update the branch 2 first with the latest trunk, continue developing and then merge it back.
I also see in “Project versions” some fields, are they safe to change?