adding a new folder from a branch to main trunk

[vai]

So I created a new folder in my dev branch and now I want to add this folder to the main branch. Merge Branch doesn't recognize that folder in the main trunk which is understandable. But what is the best way to add a new folder which is in my dev branch to the main trunk?


thanks.

[lbauer]

If you branch a folder, then create a new folder in the branch, Merge Branches should try to merge the new folder into the trunk.

Are you seeing an error when you try to merge branches?

Is the transaction that created the folder listed in the Select Changes to be Merged screen?