1. Hop Aboard the Git Train – Transitioning from TFVC
5/11/ :00 AM
Speakers: Bob Charapata, Marcus Radue
Appleton
Green Bay
Milwaukee
Hop Aboard the Git Train – Transitioning from TFVC
© Microsoft Corporation. All rights reserved.

2. Hop Aboard the Git Train – Transitioning from TFVC
Agenda
Plan your migration
Migrate your existing TFVC solution to Git
Git repository overview
Git branching strategies
Code migration best practices
Stay on track with your version control tool and learn the transition from TFVC to Git. We will demonstrate the migration process from TFVC to Git along with some things to consider before your migration. Stick around for some Git best practices that will get you off to a fast start with your new version control tool!
Agenda
Plan your migration
Migrate your existing TFVC solution to Git
Git repository overview
Git branching strategies
Code migration best practices

3. Current Challenges with TFVC?

4. Plan your Migration Evaluate your tools and processes
Solidify your code base
Migrate only 1 branch
Most recent version (can bring 180 days of history but not recommended)
Decide on new branching strategy in Git
Centralized
Distributed
Provide some Git training
Git developer best practices
Must have a vision
What are the goals we are trying to achieve as our version control system?
Makes changes to the same files with multi-user development
Isolated feature development (type of branching strategy)
Mention Hot Fix branch development
Consistent branch strategy with the ability to enforce it through branch policies
Ease of working remotely
It’s fast to switch between branches with Git’s local repository as compared to TFVC
Much faster development with remote push and pull requests
Line by line merge commit

5. Migrate your TFVC repo to Git
Clone URL:
DEMO

6. Git Repository Overview
Centralized Version Control
Distributed Version Control
Emphasize development in the local repository vs the push and pull request to the remote repository
(Server connection necessary)
(Remote Development Possible)

7. Git Branching Strategies
User stories building on current master branch
userstories/1111-MyUserStory
Collaboration branch for longer-term development around a feature
features/feature-name/master
User stories within a longer-term feature
features/feature-name/1234-UserStoryBriefDesc
features/feature-name/username/1234-UserStoryBriefDesc
Hotfixes
hotfixes/description

8. Git Repository Overview
Terminology (Checkout, Stage, Commit, Push, Pull)
Layout overview in VS
How to clone a repo in your local storage
Settings Tips
Prune remote branches
Rebase local branches
Diff & Merge tools

9. Code Promotion Best Practices
Pull requests
Create a pull request in Visual Studio or DevOps
Add comments to provide insight into your proposed changes
Pull request policies
Designate at least one approver of the pull request changes
Branch Conflicts
Resolved in a merging tool, which could be set to Visual Studio
DEMO
Talk about the prune branch feature
Must be checked out of your local development branch for the pruning to work (match remote to local)
Clarify the order of a push then pull request
Stage and push
Sync
Create pull request
Demonstrate locally and remote

10. Implement Git Branch Policies
Visual Studio Command Prompt
DEMO

11. Git Tools

12. Thanks to our GOLD Sponsor

13. Thanks to our SILVER Sponsors