Search code examples
tfsmergechangeset

TFS - Merge code from two versions of same file ( in same branch )

I have Two change sets in TFS (for a single file) , for example 8901 and 9053.

I want to merge the code in both these change sets.

The Image contains all the change sets

When I select both the change sets, I don't find any option except compare and copy. Please refer below screenshot of the same.

enter image description here

I want to merge these two changesets so that I the file will finally contain both the versions of code.

Any suggestions on how to achieve this? Please help.

Thanks in Advance.

Solution

  • Merge is using between branches, not between changesets.

    It seems 9053 is the latest version of your project, so you should have get this version in your workspace. In my example, it's TestCaseProject.

    Then you can try to create a branch for this project from 8901, named TestCaseProject-branch:

    enter image description here

    After that, perform a merge from TestCaseProject to TestCaseProject-branch, and you can check whether TestCaseProject-branch includes all changes you need in 8901 and 9053.