Introduction to Git
0 likes324 views
The document provides an introduction to Git, a distributed version control system that addresses needs in large-scale open-source projects and offers capabilities for offline work. It contrasts Git with centralized version control, highlighting its benefits, challenges, and functionality within Visual Studio and TFS. The document also advises when to switch to Git and offers best practices for managing repositories.
Introduction to Git
- 1. Introduction to Git Daniel Mann Senior Software DevelopmentConsultant InCycle Software NewYork ▪ Seattle ▪ Montreal
- 2. Agenda What is Git? Overview of Centralized vs Distributed Version Control Git in Visual Studio / TFS Is It Right For Me?
- 3. What is Git? - Distributed version control system - Designed for the challenges of large-scale open- source projects - Supports fast, off-line work
- 4. Centralized Version Control One central code repository Requires a connection to perform most operations Check out Commit Merge Branch View History Can retrieve just the files you need Limited capability for offline work Conceptually simple
- 5. Distributed Version Control No central code repository Central repository is defined by convention Does not require a connection Can only retrieve an entire repository Higher learning curve
- 6. Centralized vs. Distributed Central Server Source Code Files FilesFiles PC 1 PC 2 PC 3 Repo Remote Server Repo Repo Repo
- 7. Remote Server Repo PC 1 Repo Distributed Version Control Clone
- 8. Distributed Version Control PC 1 Repository Change 1 Change 2
- 9. Distributed Version Control PC 1 Repository Commit Branch Merge etcChange 1 Change 2 My Change
- 10. Distributed Version Control PC 1 Repository Remote Server Repo Pull Remote Changes Change 1 Change 2 Change 3 Change 1 Change 2 My Change Change 3 Change 1 Change 2 My Change Change 3
- 11. Distributed Version Control PC 1 Repository Remote Server Repo Merge remote changes with local changesChange 1 Change 2 My Change Change 3 Change 1 Change 2 Change 3 Change 1 Change 2 My Change Change 3 Change 4
- 12. Distributed Version Control PC 1 Repository Remote Server Repo Change 1 Change 2 Change 3 Change 1 Change 2 My Change Change 3 Change 4 Push Local Changes My Change Change 4 Change 1 Change 2 My Change Change 3 Change 4
- 13. Why Distributed? Work fully offline Encourages frequent commits Easy to switch work Powerful tools for viewing and rewriting history Increasingly popular
- 14. Why Not Distributed? Harder to use day-to-day Few non-OSS projects need the ability to rewrite history Git does not handle binaries well Security is defined at the repository level
- 15. Git in Visual Studio Works regardless of your Git provider …even against local repos.
- 16. Team Explorer
- 17. Team Explorer
- 18. Team Explorer
- 19. Team Explorer
- 21. Git in TFS Git and TFVC in the same project One TFVC repository Unlimited Git repository
- 25. Code review via pull requests
- 26. Enforce quality via branch policies
- 27. Branch Policies Required automated build
- 28. Branch Policies Enforce requirement linking
- 29. Branch Policies Enforce code review
- 30. Should you make the switch? Yes, if: - You work offline frequently - Your software is open-source - You want to branch and merge frequently
- 31. Should you make the switch? No, if: - You never work offline - Your software is closed-source - Developers are productive and happy using something else - You require stringent code security
- 32. Best Practices Don’t Panic Do not put binaries in Git repositories! Manage binary dependencies via a package manager Keep repos small (one repo == one application) Branch early, branch often. Don’t work directly on master. Read the Docs!
- 33. /InCycleSoftware @InCycleSoftware /company/incycle-software incyclesoftware.com/blog/ Get started with Git! For course/workshops overviews, see links below: Course: Git Fundamentals– http://incyclesoftware.com/course-git-fundamentals/ Course: Git in Team Foundation Server & VisualStudio - http://incyclesoftware.com/course-git-in-team-foundation-server-visual-studio/ Workshop: Git Migration– http://incyclesoftware.com/workshop-git-migration/ Toschedule a courseor workshop, emailus [email protected] or call1-800-565-0510