TFS Modify Merge With Delete to merge without deleting

Question

I had a problem trying to merge with the integration into the function branch.

The problem started with these three actions: 1) The ABC project was added to Solution1 in the integration branch.
2) A branched solution1 with a branch function. 3) Remote ABC project from Solution1 in the integration branch.

Now I want to merge the last of the integration into the function branch, but I do not want to delete the project ABC during the merge.

My criteria are to allow this using: a) single registration b) merge of all sets of changes (including deletion) since the last merge c) no changes to existing project names / routes

In my dreams, I request a merge, and before registering, add the remote project back from the copy that I saved and edit the solution file to save the reference data in the same project.

Does anyone have an idea how to do this, or maybe you know Microsoft's insightful link to a document, why can't I or why is this a bad idea?

I use Team Foundation Server 2010 with Visual Studio 2010 for version control, my solution and projects are developed in BIDS 2008.

Thanks for any enlightenment.

Answer 1

Combine the integration branch with the function branch.

The merge operation simply “pushes” all changes from the merge.

View pending changes and delete unnecessary deletes.

Commit.

Answer 2

I would see options for this, but you have a precondition: 1. The merging of the cherry occurs from a common branch to the traits. This means that you select all changes except those where the project has been deleted. But it is necessary that this set of changes does not contain any other changes except deleting the project. 2. Make a merge, if you get merge conflicts with project files, make the goal main. If conflicts do not occur, discard the merge changes (merge, delete) of the project in the function branches. This will mean that all changes have been combined, except for changes for a specific project.

Answer 3

The accepted answer is wrong, because the merger never ends in this way. If you go this way, you will only have a partially completed merger, and you will be asked each time again.

The real problem is that you have no conflict in the merger. Therefore, you have no parameters for the result of the merger!

So, first cancel your merge and repeat it. But before you merge again, provoke a conflict in each file using CheckingOut of the entire target branch (or just the files you want to prevent from deleting)! You can do this without editing the file. You can right-click the file in the source explorer and select CheckOut.

Then you can resolve the conflicts and merge them without accepting the deletion! :)