tags:

views:

6

answers:

0
Q: 

TFS - Merge after Directory Rename or Add

We created Main with two subdirectories, BizTalk and WebServices. Then we branched Main to Dev.

Our webservice developer (long gone) either renamed WebServies to WCFServices or deleted WebServices and added WCFServies. Now, when I attempted to Merge WCFServices, there is no item to pick on the drop down for the "Target Branch".

How do I now merge and reset the structure to allow for future merges?

related questions

What's the best visual merge tool for Git?
Algorithm for merging large files
git-svn merges and commit details
Using mercurial, what's the easiest way to commit and push a single file while leaving other modifications alone?
How can I get a summary of my cvs conflicts when doing a cvs update on the command line?
How well does Python's whitespace dependency interact with source control with regards to merging?
How to resolve a conflict with git-svn?
Subversion Branch Reintegration
Merge Modules for Crystal Reports 2008 - Needs a Keycode?
What is the proper way to do a Subversion merge in Eclipse?
Can I merge two Microsoft Word documents reliably with Subversion?
Whats the best windows tool for merging RSS Feeds?
Java: Easiest way to merge a release into one jar-file
How can a C++ windows dll be merged into a C# application exe?
Is there a good .net library for 3-way comparison of HTML that can be used for merge?
Subversion merge history visualisation
Cross-Branch merging in TFS?
View TFS checkin history through merges?
ASP.NET Merge: Virtual path 'obal.asax' is not allowed
SQL Server Merge Replication Schedule
What are some efficient ways to combine two structures in MATLAB?
Error using Team Foundation Server merge function
Subversion: Fail update when there are conflicts?
How can I merge my files when the folder structure has changed using Borland StarTeam?
SVN merge merged extra stuff