TFS: How to merge only changes on my shelf, without overwriting the local instance

Question

I am trying to find a way to merge shelf changes with the latest version that I am locally without overwriting my local files with the shelf files.

That is, I have a shelf from date 0, on date 1 some changes were made in the tree, on date 2 I make the latest version, and then when applying the shelf, the dates of change 1 change.

There is no merge conflict between changes in date 1 and the settings of my regiment.

Ideas? Thanks!

Answer 1

Finally, I decided to do

1) "get a specific version" until the date when a set of changes was made

2) "get the latest version."

In this way, TFS combines the latest version with modified local files. (Another way - what I was looking for - seems impossible).

Answer 2

Two spring options:

(Tip: before you start, back up your code if there is something there that is not safely stored on the server or in a shelf!)

• If you do not use at first, you will get locks on the shelves (0). Then GLV will receive the files (1). All files that you locked will be merge conflicts, which can then be resolved, tested, and verified as usual.

• Get the pending code and copy it to another folder on your hard drive. Then GLV is the last server code. Check the files you changed (or, more simply, the root folder), and then manually combine the two sets of sources. Then you can “cancel the check” to get rid of the unchanged files (let's say “no” to the question “discard your changes” and it will only store locks on the changed files), and after checking that your code works, check as a result files have changed.

Answer 3

You need another workspace, that is, the local folder where your working copy is located (yes, you can have more than one).

With a fresh workspace without any changes to it, you can restore your shelf there, complete the registration and not have your original workspace intact. If desired, you can delete another workspace or save it for these maintenance tasks.

To create a new workspace, simply open the source code explorer and open the Workspace combo box on the top toolbar. Select Manage Workspaces and create a new one.