Hello, I'm having a problem getting two branches to merge. The only problem I'm having is getting newly created subfolders and their files to update back to the trunk.
When I do the Merge Branches command, I can see the "Add Subfolder" items in the merge list, but the subfolders aren't added. Also, the files in those subfolders do not show up in the list.
I've tried manuallly creating the subfolders back in the trunk and merging again, but the only thing that changes is that the "Add Subfolder" items are red now, and are listed with an "Already Exists" comment. The subfolder files still do not show up in the merge list. Can anyone help me?
EDIT: Oops, I forgot to mention I just upgraded to 2.0.2
Jeff...
Merge Branches and Subfolders
Moderator: SourceGear
In Vault, a folder is added recursively, so there would be only one entry in the pending change set to add the whole folder and all its subfolders and files. If you had committed the change set, it should have added everything.
If you manually added the folder in the target, then it correctly be reported as a conflict, since you can't add a folder to a place where a folder of the same name exists.
At this point, you can either delete the folder from the target and re-run merge branches, or simply manually add the folder to the target and ignore the conflict during the merge branch operation.
If you manually added the folder in the target, then it correctly be reported as a conflict, since you can't add a folder to a place where a folder of the same name exists.
At this point, you can either delete the folder from the target and re-run merge branches, or simply manually add the folder to the target and ignore the conflict during the merge branch operation.