TFS: Overwrite a branch with another

Question

Is it possible overwrite a branch with another?

Or is the only solution to delete branch B and make a new branch from Branch A?

Answer 1

Unless you're running TFS 2010, I'd recommend using Merge + Resolve to bring the two branches back in sync.

# cancel out of conflict dialog tf merge A B -r -force -version:T tf resolve B -r -auto:acceptTheirs 

That should equalize everything, except for files that were only created in B and never merged back. Use Folder Diff to find & reconcile them.

Delete + rebranch in 2005/2008 runs the risk of nightmarish-to-debug namespace conflicts in the future. The other option, if you have 2008, is to Destroy + rebranch. Obviously that assumes you are ok with losing all the history from the original copy of B.