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
- Did a pull from our TFS root into each of the feature branches and resolved any merge issues.
- Created the feature branch in Git via the Windows Github client
- Switched context on our git repository to be that of the new branch
- xCopied our TFS branch files from TFS into the folder of our Git repository
- 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)
- Committed the changes locally
- Synced the changes to Github
- Deleted my old branch
- 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,
11-10-2012 12:02 PM