Home/ Questions/Q 6199353
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-05-24T04:10:25+00:00

The typical process we use is: Write code Checkin changes with a description of

  • 0

The typical process we use is:

  1. Write code
  2. Checkin changes with a description of what they are
  3. merge forward (dev to QA)

We have been working on a series of changes. Management decided they want us to move up a small set of these changes. These changes are all over the place. I can’t simply merge the changes by checkin/changeset as I normally do.

The only solution I can think of is to manually copy paste the changes I do want into QA. This breaks my documentation and normal flow. But, in the future the merge tool should pickup what has already been moved forward; that is when we revert back to the normal flow.

What would you do?

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    If I understand you, try to use baseless merge:

    Use baseless merge to merge items that are not directly branched from
    each other. To perform a baseless merge, you must use the tf merge
    command. When you perform a baseless merge, Team Foundation does not
    have any information about the relationship of the files in the
    braches. In a baseless merge, you must perform manual conflict
    resolutions. After you have performed the baseless merge and resolved
    any conflicts, Team Foundation records the merge history and
    establishes a relationship between the folders and files.

    Improvements to baseless merge in TFS 2010 SP1

    • 0