I ran into a problem trying to merge from integration to feature branch.
The trouble started with these 3 actions:
1) Added project ABC to Solution1 in integration branch.
2) Branched Solution1 to feature branch.
3) Deleted project ABC from Solution1 in integration branch.
Now, I want to merge latest from integration to feature branch, but I don’t want to actually delete project ABC during the merge.
My criteria are to resolve this using:
a) a single check-in
b) merging all change-sets (including the delete) since last merge
c) no changes to the existing project names/paths
In my dreams, I request the merge, and before check-in add the deleted project back in from a copy I’ve saved, and edit the solution file to retain the reference data to the same project.
Anybody out there have any idea how to go about doing this, or perhaps know an insightful Microsoft reference to document why I can’t or why that’s a bad idea?
I’m using Team Foundation Server 2010 with Visual Studio 2010 for source control, my solution and projects are developed in BIDS 2008.
Thanks for any enlightenment.
Merge the integration branch to feature branch.
The merge operation simply “pends” all changes from the merge.
Review the pending changes and remove the deletes that you don’t want.
Commit.