Search code examples
version-controlrefactoringmergestarteam

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?

Solution

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

    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.