Database test project does not merge down differences

Question

We are seeking for solution to issues with forward integration(merging down) of changes from main trunk to the development branches in our TFS setup for database source control. 

Let me try to explain the structure we have and the issue we are facing.

We have a main trunk that has all our databases solutions in it. Each database solution has a database project and a database unit test project in it. We branch off from main trunk into development folder to do our development.  We periodically merge down  any new changes made to the main Trunk. Here is were I am having an issue with the test project.   In the main trunk , a few changes were made to the test project configurations like changing database test connection(app.config file changes), adding references (xxx.csproj file changes). When try to merge down these changes to all the respective development branches, the merge does not happen. TFS behaves as if it did not see any change in the files. 

Please suggest if anyone has any clue of what the issue here is. Let me know if I need to provide any more information.

Answer 1

Hello HimaT,

I am sorry that I can't reproduce your issue. I did a test on my machine, and I can merge some modifications from Main branch to Dev branch. Please make sure you have checked-in these pending changes before you do the Merge operation. In addition, on the Source Control Merge Wizard dialog, please select the latest version as the Version Type in the dropdown list.

Thanks,

---

Vicky Song [MSFT]
MSDN Community Support | Feedback to us