Downloaded 26 times
Uploaded byUri Goldstein
Intro to Git and GitHub
The document provides an introduction to Git, highlighting its advantages over Subversion (SVN) in terms of speed and ease of use for version control tasks such as committing and merging. It explains Git's integration with GitHub, which is portrayed as a popular platform for sharing code, and outlines the Git workflow emphasizing stable branches and pull requests. The document concludes with a brief overview of a typical day using Git and GitHub for software development.
More Related Content
Similar to Intro to Git and GitHub
Intro to Git and GitHub
- 1. Introduction to Git UriGoldstein
- 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 isa Swiss Army Knife. • Once you master it, it’ll make your life easier.
- 5. LIFECYCLE OF ACHANGE
- 6. Subversion SVN Server TCMW Repository Uri’s Machine TCMW LocalCopy Lior’s Machine TCMW Local Copy
- 7. Git – EveryoneGets 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 ofa Change Staging Area Local Git Repository Remote Git Repository Commit PushC:dev MyClass.cs Stage
- 9.
- 10. Lifecycle of aChange – Cont’d GitHubLior’s Machine C:dev MyClass.cs Local Git Repository Remote Git Repository Merge Pull
- 11.
- 12. Subversion • Creating branchestakes time. • Commits are big. • SVN stores diffs in repo. • Merging is a pain
- 13. Subversion Trunk Uri makes changes on hismachine Lior makes changes on his machine Conflict
- 14. Git • Creating branchesis a snap. • Commits are small and frequent. • Git stores full files in repo. • Merging is a joy much less painful.
- 15.
- 16.
- 17.
- 18.
- 19. GitHub • Huge onlinecommunity for open-source projects = Public. • Huge online service for commercial start-ups and enterprises = PRIVATE. • Runs Git Flow.
- 20.
- 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 inthe 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 inthe 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.
- 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