How do I merge a local branch into TFS

Posted by Johnny on Stack Overflow See other posts from Stack Overflow or by Johnny
Published on 2010-05-06T09:38:10Z Indexed on 2010/05/11 21:24 UTC
Read the original article Hit count: 301

Filed under:

source-control

|

visual-studio

|

tfs

hi,

I did a stupid thing and branched my project on my local disk instead of doing it on the TFS. So now I have two projects on my disk: the old one which has TFS bindings and the new, which doesn't. I want to merge those changes back into the TFS project. How would I go about doing that? I can't do Compare because my local branch has no TFS bindings. There should be some way to compare the differences between the two projects locally and then meld the differences into the old project and check-in, but I can't find an easy way of doing that. Any other solutions?

© Stack Overflow or respective owner

Related posts about source-control

Getting a Database into Source Control

as seen on Simple Talk - Search for 'Simple Talk'
For any number of reasons, from simple auditing, to change tracking, to automated deployment, to integration with application development processes, you’re going to want to place your database into source control. Using Red Gate SQL Source Control this process is extremely simple. SQL Source Control… >>> More
Stairway to Database Source Control Level 2: Getting a Database into Source Control

as seen on SQL Server Central - Search for 'SQL Server Central'
In this level, we're going to continue the philosophy of learning by example, and get a database into our SVN repository. We will also consider our overall approach to source control for databases, and the manner in which our team will develop these databases, concurrently. 24%… >>> More
Webinar: SQL Source Control 3.0 Connect your existing source control system to SQL Server

as seen on SQL Server Central - Search for 'SQL Server Central'
Find out what SQL Source Control & SQL Compare can do for your database development and deployment processes at one of our free weekly webinars. Each webinar includes a 30 minute software demonstration and a Q&A session. The Future of SQL Server Monitoring "Being… >>> More
Putting a versioned-but-not-via-source control project in source control

as seen on Stack Overflow - Search for 'Stack Overflow'
I have some old code (an old but still maintained VB6 application) that from a source control point of view is the ultimate example of the plumber's plumbing (or cobbler's shoes). It's been version controlled by the approach of making a new directory for each version. Are there any major downsides… >>> More
SQL Server devs–what source control system do you use, if any? (answer and maybe win free stuff)

as seen on SQL Blog - Search for 'SQL Blog'
Recently I noticed a tweet from notable SQL Server author and community dude-at-large Steve Jones in which he asked how many SQL Server developers were putting their SQL Server source code (i.e. DDL) under source control (I’m paraphrasing because I can’t remember the exact tweet and Twitter’s search… >>> More

Related posts about visual-studio

The Visual Studio development environment crashes when you open Visual Studio 2005, Visual Studio 20

as seen on Dot net Slackers - Search for 'Dot net Slackers'
983279 ... The Visual Studio development environment crashes when you open Visual Studio 2005, Visual Studio 2008, or Visual Studio 2010This RSS feed provided by kbAlerz.com.Visit kbAlertz.com to subscribe. It's 100% free and you'll be able to recieve e-mail or RSS updates for the technologies… >>> More
The Visual Studio development environment crashes when you open Visual Studio 2005, Visual Studio 20

as seen on Dot net Slackers - Search for 'Dot net Slackers'
983279 ... The Visual Studio development environment crashes when you open Visual Studio 2005, Visual Studio 2008, or Visual Studio 2010This RSS feed provided by kbAlerz.com.Visit kbAlertz.com to subscribe. It's 100% free and you'll be able to recieve e-mail or RSS updates for the technologies… >>> More
Visual Studio 2008 Professional with MSDN Professional to Visual Studio 2010

as seen on Stack Overflow - Search for 'Stack Overflow'
With Visual Studio 2010 right around the corner, what does Visual Studio 2008 Professional with MSDN Professional upgrade to in Visual Studio 2010? Do I get 2010 for free, if I buy this flavor of 2008 now? >>> More
C# development with Mono and MonoDevelop

as seen on Developer IT - Search for 'Developer IT'
In the past two years, I have been developing .NET from my MacBook by running Windows XP into VM Ware and more recently into Virtual Box from OS X. This way, I could install Visual Studio and be able to work seamlessly. But, this way of working has a major down side: it kills the battery of my laptop…… >>> More
ASP.NET MVC 2 Released

as seen on ASP.net Weblogs - Search for 'ASP.net Weblogs'
I’m happy to announce that the final release of ASP.NET MVC 2 is now available for VS 2008/Visual Web Developer 2008 Express with ASP.NET 3.5. You can download and install it from the following locations: Download ASP.NET MVC 2 using the Microsoft Web Platform Installer Download… >>> More