How to recover after a merge failure in TFS 2008?

Posted by steve_d on Stack Overflow See other posts from Stack Overflow or by steve_d
Published on 2010-03-15T20:51:44Z Indexed on 2010/03/15 21:29 UTC
Read the original article Hit count: 323

Filed under:

tfs

|

merge

|

visual-studio-2008

We recently attempted a large, "cherry picked" merge. First we did a full merge from one child development branch into the parent Main branch, then did a full merge of the Main branch into another child development branch, then we attempted to do a cherry pick merge from the second Development branch back into merge. There were many checkins, including renames and deletes; and when it wasn't working the person who was doing it did a bunch of TFPT rollbacks.

What options do we have to recover here? Things like baseless, force, etc merge? Roll back to a point in time and somehow, try again?

© Stack Overflow or respective owner

Related posts about tfs

TFS - Rebinding solution to new TFS when prior TFS no longer available

as seen on Stack Overflow - Search for 'Stack Overflow'
The prior instance of TFS I was using is no longer available and I have a test project I want to bind to the new instance of TFS. However, when I try to add the solution to source control, the error message tells me that the collection is not available on the server. I have deleted all old source… >>> More
TFS 2010 Basic Concepts

as seen on Geeks with Blogs - Search for 'Geeks with Blogs'
v\:* {behavior:url(#default#VML);} o\:* {behavior:url(#default#VML);} w\:* {behavior:url(#default#VML);} .shape {behavior:url(#default#VML);} Normal 0 false false false false EN-US X-NONE X-NONE … >>> More
TFS 2010, can I migrate source code only ?

as seen on Stack Overflow - Search for 'Stack Overflow'
Our old TFS 2008 installation is getting old, and we would like to migrate to TFS 2010. However, the structure of our team projects is not so well thought out, and there has been various experiments with process templates and editing of work items and so on. Therefore, I would like to migrate our… >>> More
Insufficient Permissions Problems with MSDeploy and TFS Build 2010

as seen on ASP.net Weblogs - Search for 'ASP.net Weblogs'
I ran into these problems on a TFS 2010 RC setup where I wanted to deploy a web site as part of the nightly build: C:\Program Files (x86)\MSBuild\Microsoft\VisualStudio\v10.0\Web\Microsoft.Web.Publishing.targets (3481): Web deployment task failed.(An error occurred when reading the IIS Configuration… >>> More
TFS 2008 Web Access Report 100 record limitation

as seen on ASP.net Weblogs - Search for 'ASP.net Weblogs'
By default TFS 2008 Web Access has the limit of 100 record when you open any query in report mode. Even if you tried to export the query to excel or PDF you will only get first 100 record exported. To overcome this issue, you have to reconfigure this count in the web.config file Navigate to… >>> More

Related posts about merge

Foreach PHP Error

as seen on Stack Overflow - Search for 'Stack Overflow'
I am receiving the following foreach error on my PHP file and I have no idea how to fix it. Does anyone have any ideas? When I load the page I get this: Warning: Invalid argument supplied for foreach() in /home/mysite/public_html/merge/class/global_functions.php on line 61 Warning: Invalid argument… >>> More
TFS 2010 SDK: Smart Merge - Programmatically Create your own Merge Tool

as seen on Geeks with Blogs - Search for 'Geeks with Blogs'
Technorati Tags: Team Foundation Server 2010,TFS SDK,TFS API,TFS Merge Programmatically,TFS Work Items Programmatically,TFS Administration Console,ALM The information available in the Merge window in Team Foundation Server 2010 is very important in the decision making during the merging process… >>> More
mail merge e-mail in Word 2007 with attachment

as seen on Super User - Search for 'Super User'
Is there a simple way to mail merge with Word 2007 and add an attachment? I've searched google, and all results point to pasting in VB code. I want to a small team of novice users to be able to mail merge e-mails and add attachments. Does anyone know a simple way of doing this without code? >>> More
Improving Partitioned Table Join Performance

as seen on SQL Blog - Search for 'SQL Blog'
The query optimizer does not always choose an optimal strategy when joining partitioned tables. This post looks at an example, showing how a manual rewrite of the query can almost double performance, while reducing the memory grant to almost nothing. Test Data The two tables in this example use… >>> More
Simple Branching and Merging with SVN

as seen on Dot net Slackers - Search for 'Dot net Slackers'
Its a good idea not to do too much work without checking something into source control. By too much work I mean typically on the order of a couple of hours at most, and certainly its a good practice to check in anything you have before you leave the office for the day. But what if your… >>> More