3

I am doing a baseless merge between a branch B and C, since we do not want to go to trunk and down. B and C are latest with all trunk changes.

Before I did a baseless merge in Visual Studio 2013, I did compare of the two branches, It said 6220 files compared(150 different, 179 only in source and 213 only in target), so I was happy.

Even after i did the merge it came up with around 100+ conflicts to resolve, But what worried me was that the changeset had 6000+ files, so it is clear that if i check-in TFS would check-in files which have not been changed as well.

Is there an option so that the final merged changeset contains only the files that are different + only in source +only in target ?

Here is what I did to do the merge and avoid unchanged files in the changeset

  1. Exclude all the newly added files that is only in source (fortunately I had this entire list)
  2. Undo your pending changes. When you get the confirmation dialog choose "No to all". Visual Studio will take some time to process and will end up with the files that have only changed.
  3. Then Include the newly added files that was excluded in Step 1
4

1 回答 1

2

是正常现象。当您进行无基础合并时，解决方案中的每个文件都被标记为已更改，并在签入期间列在挂起的更改中。没有选项可以简单地进行合并来满足您的要求。

undo your pending changes. When you get the confirmation dialog choose "No to all". Only your pending changes should be left.但是，您可以从这个问题中尝试以下解决方法文件在进行未更改的合并时列为待处理的更改？
注意：当您只更改文件时，此方法有效。它不会合并您添加的任何新文件。

于 2015-12-15T10:02:42.747 回答