使用Borland StarTeam更改文件夹结构后，如何合并文件? [英] How can I merge my files when the folder structure has changed using Borland StarTeam?

问题描述

我正在重构一些代码，其中包括移动文件夹，我想定期合并以使事情保持最新状态.在工作副本中移动文件夹后，合并的最佳方法是什么?

I'm in the process of refactoring some code which includes moving folders around, and I would like to regularly merge to keep things current. What is the best way to merge after I've moved folders around in my working copy?

推荐答案

您也可以在StarTeam中移动文件.然后合并.

You can move the files around in StarTeam also. Then merge after that.

无论您做什么，请确保不要删除文件并重新添加到StarTeam中.如果这样做，您将丢失文件历史记录.

Whatever you do, make sure you don't delete the files and re-add in StarTeam. You'll lose the file history if you do that.

这篇关于使用Borland StarTeam更改文件夹结构后，如何合并文件?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！