My TFS is not propmting for Merges/ Code differences? Are there any TFS settings? RRS feed

  • Question

  • Hi

    I got the latest code for my database project. When i check in my stored proc, It simply overwrote the TFS version and it din't even prompt for any Merges or differences.

    Wondering if there are settings that i have to take care?






    Wednesday, December 14, 2011 9:19 PM


  • Hi Sai,


    Thanks for your post.


    As far as I know, the default Merge Tool which in VS will be trigged automatically, it not need to set.


    In your scenario, you got the latest database project from TFS Source Control, during this same time, I think there’s no other users check out that project and perform Check In to generate a new changeset for your project before you check in, so when you preform Check In on your project, it will simply overwrite the TFS version, that’s normally in TFS Source Control. If you want to view the different for that stored proc file, you can right-click on it and select Compare to view.  

    John Qiao [MSFT]
    MSDN Community Support | Feedback to us
    • Marked as answer by sairam2425 Thursday, December 15, 2011 2:35 PM
    Thursday, December 15, 2011 3:20 AM