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?
A:
Delete the branch B and create a new one from branch A.
Is there a reason why you do not want to do this?
Martin Woodward
2010-01-19 12:25:36
I want to keep the same name, and I wonder if it might be a problem to delete and rebranch.
Henrik
2010-01-19 14:04:40
No problems that I can think of (apart from the fact that un-deleting the old branch would be difficult if you ever wanted to do that)
Martin Woodward
2010-01-20 16:01:14
+1
A:
Unless you're running TFS 2010, I'd recommend using Merge + Resolve to bring the two branches back in sync.
tf merge A B -r -force -version:1~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.
Richard Berg
2010-01-19 15:09:59
"Delete + rebranch in 2005/2008 runs the risk of nightmarish-to-debug namespace conflicts in the future. " - Amen to that!
AakashM
2010-01-19 15:11:08