Merge to new branch

[bes51659]

I have created a new empty branch and wanted to merge my baseline into it. (test repository)
The repository is only 4 files
I then get this error

bug1.jpg (112.53 KiB) Viewed 1983 times

I know I have managed to do this before. Something is different.

What have I done wrong?
Why is not all 4 files reported?

The only diff I can tell between the files are that the other three only have one version. SwingSource.c is the only one with two versions.

[lbauer]

It's not clear from the screenshot. Email sourcegear.com, Attn: Linda and we'll take a closer look. Please include a link to this forum post.

[bes51659]

I think I know what I did wrong...

I had a baseline folder directly under the root in the repository.

Then I created another FOLDER from the root in the repository and tried to MERGE the files from the baseline folder.

What I should have done was to create a BRANCH from the baseline folder.

Correct?

[lbauer]

Yes. Merging branches works best when there is a trunk-branch relationship between two folders in Vault, rather than two folders that have no common history.