Derik Whittaker

Syndication

News


Images in this post missing? We recently lost them in a site migration. We're working to restore these as you read this. Should you need an image in an emergency, please contact us at imagehelp@codebetter.com
The VS Team Branch Merge Dance Explained

Just wanted to dump a quick how-to on doing branch to trunk merges in VS Team.  It is pretty simple really, only a few steps.

  1. Pull the latest of the branch to your local disk
  2. Pull the latest of the trunk to your local disk
  3. Merge and Pray (more on this at a later date)

Yea sounds pretty easy right.... WRONG.  Tonight we spent 5 hours doing a very long, very painful, very tiring merge.  Only to finally realize that the person doing the merge (we were doing a group merge via desktop sharing because of what had changed) had not gotten latest of the trunk. 

We all just assumed that it would merge with the latest in the trunk and not look at your local disk.  Boy were we wrong. 

The entire time we were doing the merge, something did not feel right.  Well, that damn gut feeling was right again.  Oh well, we will try it again, this time with the LATEST.

So, just remember, GET LATEST FIRST.

Till next time,

Derik the merge exhausted (sorry Kyle, had still your signoff this time) :)


Posted 02-14-2008 9:43 PM by Derik Whittaker

[Advertisement]

Comments

Chris Ortman wrote re: The VS Team Branch Merge Dance Explained
on 02-15-2008 9:05 AM
Kyle Baley wrote re: The VS Team Branch Merge Dance Explained
on 02-15-2008 9:55 AM

This time, try it with a soundtrack. It might go faster.

About The CodeBetter.Com Blog Network
CodeBetter.Com FAQ

Our Mission

Advertisers should contact Brendan

Subscribe
Google Reader or Homepage

del.icio.us CodeBetter.com Latest Items
Add to My Yahoo!
Subscribe with Bloglines
Subscribe in NewsGator Online
Subscribe with myFeedster
Add to My AOL
Furl CodeBetter.com Latest Items
Subscribe in Rojo

Member Projects
DimeCasts.Net - Derik Whittaker

Friends of Devlicio.us
Red-Gate Tools For SQL and .NET

NDepend

SlickEdit
 
SmartInspect .NET Logging
NGEDIT: ViEmu and Codekana
LiteAccounting.Com
DevExpress
Fixx
NHibernate Profiler
Unfuddle
Balsamiq Mockups
Scrumy
JetBrains - ReSharper
Umbraco
NServiceBus
RavenDb
Web Sequence Diagrams
Ducksboard<-- NEW Friend!

 



Site Copyright © 2007 CodeBetter.Com
Content Copyright Individual Bloggers

 

Community Server (Commercial Edition)