1 / 24

Sofia Event Center 14-15 May 2014

Sofia Event Center 14-15 May 2014. Git For TFS Developers. Martin Kulov. Centralized VCS. CVS Subversion Perforce Vault ClearCase Visual SourceSafe Team Foundation Version Control. Distributed VCS. Mercurial BitKeeper Fossil Bazaar Git. Centralized vs Distributed VCS.

lana
Download Presentation

Sofia Event Center 14-15 May 2014

An Image/Link below is provided (as is) to download presentation Download Policy: Content on the Website is provided to you AS IS for your information and personal use and may not be sold / licensed / shared on other websites without getting consent from its author. Content is provided to you AS IS for your information and personal use only. Download presentation by click this link. While downloading, if for some reason you are not able to download a presentation, the publisher may have deleted the file from their server. During download, if you can't get a presentation, the file might be deleted by the publisher.

E N D

Presentation Transcript

  1. Sofia Event Center 14-15 May 2014 Git For TFS Developers Martin Kulov

  2. Centralized VCS • CVS • Subversion • Perforce • Vault • ClearCase • Visual SourceSafe • Team Foundation Version Control

  3. Distributed VCS • Mercurial • BitKeeper • Fossil • Bazaar • Git

  4. Centralized vs Distributed VCS • “master” vs “blessed” copy • “online” vs “offline” history • “expensive” vs “cheap” branching • diffs vs snapshots

  5. Git in TFS and VSO • Supports every Git client • OSS implementation, not Microsoft one • Available in Visual Studio Online • Also in Team Foundation Server 2013 • Enterprise features

  6. Enterprise Git • Easy installation and management • Support • High availability and scale • Integration authentication • Enhanced permissions • ALM integration • Localization

  7. Git in Visual Studio • Create, clone repo • Push, pull, sync • Branching • Work Item linking • Simplified history

  8. Installing Git • http://msysgit.github.io/

  9. The “perfect” Git environment • Chocolatey • cinstPoshGit • cinst Git-Credential-Winstore • Enable TFS alternate credentials

  10. Configuring Git • gitconfig --global user.name "Your Name" • gitconfig --global user.email "Your Email“ • .gitignore

  11. Installing Git demo

  12. Git commands (1) • init(“disconnected”) • clone (“connected”) • add, commit (“local”) • push, pull, fetch (“remote”) • status • log • gitk --all

  13. Git basics • Full history is downloaded • History contains commits • Each commit is a snapshot, not a diff • Checksums are calculated • Operations are local • Three states • Working folder • Index (staged)

  14. Git states • tracked • modified • staged

  15. Creating repo demo

  16. Anatomy of a commit • Author • Committer • Date • Message • Parent commit(s) f46b2 time 27d72 92da1 a72c2

  17. Branches master * • Pointer to a commit • Stay local unless explicit push • Easy to create and delete • Remotes are read-only • HEAD is another pointer f46b2 feature1 time 27d72 92da1 a72c2 origin

  18. Git commands (2) • remote • branch, checkout, merge • rebase

  19. Working with branches demo

  20. Changing history • git rebase • Change commit’s parent

  21. Centralized Workflow • One central repo • Dev team push and pull from it • gitpull --rebase origin master

  22. Centralized workflow demo

  23. Links • git-scm.com/book • www.atlassian.com/git/ • Microsoft Virtual Academy – Using Git with Visual Studio 2013

  24. Questions??? Share your feedback for this particular session and for the overall conference experience at http://aka.ms/intouch for a chance to win our prizes!

More Related