We are on a project using Microsoft Team Foundation Server for source control and have run in to some issues.
We have a "Main" branch that has been branched out to another branch "Child" which we have been working on for a while.
Now we want to merge back the "Child" into "Main" the trouble is that almost no files gets included in the merge. If I pick "Compare" between the branches it says 74 files have changed. But then when I try to use the merge command only one file appear in the "Pending changes".
Anyone have any ideas why this might happen? It seems the TFS:s merging/branching capabilities are very limited.