如何将新文件夹从子分支合并到主分支的情况下?

问题描述:

如何将子分支中新创建的文件夹合并到主分支中?

How can I merge a newly created folder in a sub branch to the main branch?

我去了版本树,并确实通过绘图创建了合并。

I went to the version tree and did create merge by drawing.

但是我仍然看不到主分支中的文件夹,主分支上的版本为0。

But it still I cannot see the folder in main branch and the version on main branch is 0.

有人可以吗

仅合并文件夹(通过在文件夹版本和目标分支之间绘制红色箭头)不是吗?

Merging only the folder (by drawing a red arrow between the version of the folder and the destination branch) is not enough.

该新文件夹已在父文件夹中引入,该文件夹也需要合并。这样一来,您便可以在目标视图中看到该文件夹​​。

That new folder has been introduced in a parent folder, which needs to be merged as well. That is what would allow you see to see that folder in the destination view.

最好转到目标视图中的父文件夹(该文件夹用于创建版本(目标分支上的版本),然后从此处执行 findmerge

参见此 cleartool findmerge 问题

It is best to go to the parent folder in the destination view (the one set to create version on the destination branch) and do a findmerge from there.
See this cleartool findmerge question.

cd D:\bView\Folder1
cleartool findmerge . -ftag a_view -merge