Derik Whittaker

Syndication

News


How we handled our branches during our TFS to Git migration

In my prior post I documented the steps and processes that OUR team took to move from hosting our source in a TFS solution to Git/Github (remember, these are SIMPLY our steps).  However, one thing I did not mention is how we moved our feature branches from TFS to Github.

Given the fact that TFS and GIT treat branches treated 100% differently at the lowest level, we knew we would NOT be able to clone/convert our features branches in any reasonable manor and push those into Git. However, these branches were still active and did need to get them out of TFS and into Git.

So how did we migrate/push our feature branches from TFS to Git?  Simply xCopy :)

What we did was the following

  1. Did a pull from our TFS root into each of the feature branches and resolved any merge issues.
  2. Created the feature branch in Git via the Windows Github client
  3. Switched context on our git repository to be that of the new branch
  4. xCopied our TFS branch files from TFS into the folder of our Git repository
  5. Let the Windows Github client pick up the changes (I had to restart the Windows client in order for changes to get noticed, but that may not be required for everyone)
  6. Committed the changes locally
  7. Synced the changes to Github
  8. Deleted my old branch
  9. Had a beer.

As you can see from above, there were a few steps involved, and there may have been a better way.  However, this just worked for us.

Till next time,


Posted 11-10-2012 12:02 PM by Derik Whittaker
Filed under: , ,

[Advertisement]

Comments

tcmaster wrote re: How we handled our branches during our TFS to Git migration
on 11-14-2012 8:02 AM

so what about the history in branches? simply gone? I think a migrate script to automate tfs and git would help.

dsfghdfh wrote re: How we handled our branches during our TFS to Git migration
on 11-17-2012 8:42 AM

“I know in my first couple years I wasn’t the same type of player I am right now and how important it is to me to be a complete player,” Molina said. “That’s what my team needs from me. That’s what my focus has to be. I’m proud of what I did this year. Next year I want to be even better. The goal is to win a championship. That’s what it always is.”

buy viagra wrote re: How we handled our branches during our TFS to Git migration
on 02-03-2013 1:08 AM

QfIo4Q Thanks-a-mundo for the blog article.Really thank you! Want more.

buy viagra wrote re: How we handled our branches during our TFS to Git migration
on 02-03-2013 8:59 AM

9TMjxQ Im grateful for the blog article.Much thanks again. Keep writing.

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)