Intro to Git and GitHub
•Download as PPTX, PDF•
2 likes•1,212 views
A brief introduction to Git and GitHub. Target audience is people coming in from SVN or similar source control systems.
Recommended
More Related Content
What's hot
What's hot (20)
Similar to Intro to Git and GitHub
Similar to Intro to Git and GitHub (20)
Recently uploaded
Recently uploaded (20)
Intro to Git and GitHub
- 1. Introduction to Git Uri Goldstein
- 2. What is Git? • A Version Control System like SVN - ONLY BETTER. • Everything is faster and easier: – Committing. – Reverting. – Branching. – Merging. • Work disconnected = Offline.
- 3. What is GitHub? • A web-based git hosting service. • Like Assembla, only better. • Uses a simple workflow = GitHub Flow. • Extremely popular. • A community of devs sharing code.
- 4. But… • Git is a Swiss Army Knife. • Once you master it, it’ll make your life easier.
- 5. LIFECYCLE OF A CHANGE
- 6. Subversion SVN Server TCMW Repository Uri’s Machine TCMW Local Copy Lior’s Machine TCMW Local Copy
- 7. Git – Everyone Gets a Repo Git Server TCMW Repository Uri’s Machine TCMW Working Copy Lior’s Machine TCMW Working Copy TCMW Repository TCMW Repository “Origin”
- 8. GitHubUri’s Machine Lifecycle of a Change Staging Area Local Git Repository Remote Git Repository Commit PushC:dev MyClass.cs Stage
- 9. Demo
- 10. Lifecycle of a Change – Cont’d GitHubLior’s Machine C:dev MyClass.cs Local Git Repository Remote Git Repository Merge Pull
- 11. BRANCHES
- 12. Subversion • Creating branches takes time. • Commits are big. • SVN stores diffs in repo. • Merging is a pain
- 13. Subversion Trunk Uri makes changes on his machine Lior makes changes on his machine Conflict
- 14. Git • Creating branches is a snap. • Commits are small and frequent. • Git stores full files in repo. • Merging is a joy much less painful.
- 17. Demo
- 18. GITHUB AND GITHUB FLOW
- 19. GitHub • Huge online community for open-source projects = Public. • Huge online service for commercial start-ups and enterprises = PRIVATE. • Runs Git Flow.
- 20. GitHub Flow
- 21. GitHub Flow • ‘master’ branch is always stable. • Devs use ‘feature’* branches. • Feature branches pull from master freely. • Feature branches merge back to master via Pull Request = PR. • Pull Request reviewed by peer + auto tests. ‘master’ branch is always stable.
- 22. A day in the life 1/2 • Brew a hot cup of coffee. • Pull latest from origin master. • Need to work on new feature • Branch = create new feature branch. • Code and commit in small increments. • Lunch!
- 23. A day in the life 2/2 • Brew a hot cup of coffee. • Pull latest from origin master. • Resolve tiny conflicts easily. • Verify quality with unit/integ. tests. • Submit Pull Request (PR) for review. • Nag reviewers to review. • PR accepted? Verify master green on build server • Celebrate the day with a drink.
- 24. Demo
- 25. Thank you. • http://tinyurl.com/gitandgithub • Git Documentation http://www.git-scm.com/ • Pro Git – Free book http://www.git-scm.com/book/en/v2 • GitHub http://github.com/ • SourceTree – Git Client https://www.sourcetreeapp.com/ • Use Visual Studio with Git https://msdn.microsoft.com/en-us/library/hh850437.aspx
Editor's Notes
- Setup? Clone Change on disk Add to staging Commit to local Push to remote
- Pull from remote Branch Feature Make changes Commit Branch Bug Commit and push Checkout Feature Pull Push
- Pull from remote Branch Feature Make changes Commit Branch Bug Commit and push Checkout Feature Pull Push