0

不久前，我错误地删除了一个文件夹“Data”，然后提交。问我的高级开发人员该怎么做，他说“我会再次添加文件”，事后看来这是错误的选择。TFS 将这些文件视为 2 个不同的文件，因此当我们合并时我们会遇到冲突。另一位开发人员（正在进行合并）灵机一动，决定重命名所有旧文件，然后合并。这是 6 个月前的事，渗透到我们所有的子分支。

现在我们有几个带有以下文件的分支

父分支
Actor.csv
Actor.csv.old

子分支
Actor.csv
Actor.csv.old

我通过在（父分支）actor.csv.old 到（子）actor.csv 和（父）actor.csv 到（子）actor.csv 之间进行毫无根据的合并解决了合并错误

但是现在该文件夹中到处都是 .old 文件。我该如何摆脱这些？将 .csv 文件与 .csv.old 文件合并？删除 .csv.old 文件？

4

1 回答 1

0

In the end we just struggled through it. We deleted the .old files but then it would also delete the original files (since they were linked I'm guessing). Then after that delete we undeleted them and then merged. Problem solved. .old files were deleted and we were able to merge.

于 2013-02-21T13:08:43.673 回答