CODEWITHSUNDEEP
tfsversion-controlmerge
DDan
DDan

Reputation: 8276

TFS Simple Reverse Integration Marks All Files As Changed

I have a simple structure in TFS. Something like this:

          [Main]
            |
     ---------------
    |       |       |
  [Br1]   [Br2]   [Br3]

The code is merged from Main to Br3 has been worked with in Br3 for a while. Then one merge happened from Br3 to Main with a few conflicts (about 15 files) and once trying to check in on Main branch I get a huge number of files marked as changed to be checked in. I assume those are all the files in the Main branch. When randomly comparing some of the marked ones, there is no visible change between to two (even if displaying white spaces).

Anyone knows what happened here?

EDIT

How do I find out if the change would only be in the file access rights between my local and server file, and how could I ignore those kind of changes?

Upvotes: 0

Views: 76

Answers (1)

Chamberlain
Chamberlain

Reputation: 901

According to your comment. Since you are doing a baseless merge. Then its a normal phenomenon. When you did the baseless merge, every single file in the solution was marked as changed and listed in the pending changes during check in. There is no option which you can simply ignore those kind of changes.

Did you mean you want to find out 'the real changed files'?

You can try below workaround undo your pending changes. When you get the confirmation dialog choose "No to all". Only your pending changes should be left. from this question Files listed as pending changes when doing merges that didn't change?

Note: This works when you only have changes to files. It will not merge any New files that you have added.

Upvotes: 2

Related Questions