使用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?I'm in the process of refactoring some code whi