visual-studiotfs

Merge TFS changeset between branches rather than selecting files

I am making changes in a feature branch and merging these across to the main development branch, by just merging the folders with modified files and letting TFS detect the files that need to be merged.

But is there not a way to say "just merge this changeset" so I know only the specific changes in a commit are being merged?

I am not having luck looking through the GUI or on Google for an answer one way or the other.

Solution

  • Is there something from the "Selected Changesets" merge option that isn't working for you? You're able to select specific change sets to merge, though there can be potential issues.

    From the merge dialogue, select your source and target. Make sure to select "Selected Changesets"

    enter image description here

    Now select the changeset your want to merge:

    enter image description here

    Finish the merge:

    enter image description here

    As per usual TFS merge, the changes are merged into your workspace, and not commited until you actually check in.