locked
Merging files across different TFS servers RRS feed

  • Question

  • We have a development scenario where in which 2 teams are working in 2 different TFS servers. But we have to merge the changes in files  from server1 to server2. (for the same application).Please let me know if there are any options/features/tools (similar to merging files across branches in the same server)to merge files across 2 different TFS in this scenario as well?

    Thanks in Advance.

    Wednesday, November 22, 2017 4:53 AM

All replies

  • Hi sasusi,

    Thank you for posting here.

    You can try the Baseless Merge in TFS.

    Create a new branch in one of the TFS (A) , then copy the project from another TFS (B), and check in to the new branch in TFS A.

    Run tf merger command from the tfs command prompt,

    tf.exe merge /recursive /baseless $/TeamProject/SourceBranch $/TeamProject/TargetBranch

    Also reference this article: How To: Perform a Baseless Merge in Visual Studio Team Foundation Server

    Best Regards.


    MSDN Community Support
    Please remember to click "Mark as Answer" the responses that resolved your issue, and to click "Unmark as Answer" if not. This can be beneficial to other community members reading this thread. If you have any compliments or complaints to MSDN Support, feel free to contact MSDNFSF@microsoft.com.

    Friday, November 24, 2017 9:54 AM