Download as PDF, PPTX
Uploaded byNick Pruehs
Tool Development A - Git
The document outlines the objectives of learning Git, covering version control systems, installation of Git and SourceTree, and basic operations like pulling, committing, and merging. It explains Git branching strategies, including main, feature, release, and hotfix branches, along with best practices for merging. References for further reading and contact information are also provided.
More Related Content
Similar to Tool Development A - Git
![[2015/2016] Collaborative software development with Git](https://cdn.slidesharecdn.com/ss_thumbnails/04secollaborativedevelopment-151120174340-lva1-app6891-thumbnail.jpg?width=640&height=640&fit=bounds)
Tool Development A - Git
- 1. Tool Development Appendix A:Git Nick Prühs
- 2. Objectives • To getan overview of version control systems in general • To learn how to use Git in a production environment • To understand advanced concepts of branching and merging 2 / 58
- 3.
- 4.
- 5.
- 6.
- 7.
- 8.
- 9.
- 10. DEMO • Installing Git •Installing SourceTree • Creating a GitHub account • Creating a Git repository • Cloning the repository 10 / 58
- 11. DEMO • Check filestatus • Adding new files • Viewing changes • Staging modified files • Moving files • Removing files 11 / 58
- 12. DEMO • Pulling • Commitingchanges • Pushing 12 / 58
- 13. DEMO • Unstaging files •Reverting files 13 / 58
- 14. DEMO • Viewing history •Ignoring files • Tagging 14 / 58
- 15.
- 16. Git Commit &Parents 16 / 58
- 17.
- 18.
- 19.
- 20.
- 21.
- 22.
- 23.
- 24.
- 25.
- 26.
- 27.
- 28.
- 29. Hint Split your workup into small, unrelated commits! 29 / 78
- 30. Git Commit Messages 30/ 58 • ADDED • CHANGED • REMOVED • FIXED
- 31. GitFlow • Originally developedby Vincent Driessen • Assigns very specific roles to different branches, and defines how and when they should interact • Allows merging and branching to be part of your daily workflow 31 / 58
- 32. Main Branches • master •origin/master HEAD is always ready for production • develop • origin/develop HEAD always contains the latest delivered development changes • Nightly builds are created from this branch • Whenever considered stable, merged back into master and tagged 32 / 58
- 33.
- 34. Supporting branches • Featurebranches • Allow parallel development • Make tracking features easier • Release branches • Help preparing for releases • Hotfix branches • Enable you to quickly fix live problems 34 / 58
- 35. Feature Branches • Branchfrom and merge back into develop • Used for developing new features • Exists while the feature is in development • Will eventually be • Merged back, to include the new feature in the next release, or • Discarded, if the feature should not be included • Never directly interact with the master branch 35 / 58
- 36.
- 37. Hint Merging with the“no fast-forward” option causes the merge to always create a new commit. This makes tracking of your branches a lot easier! 37 / 78
- 38. Release Branches • Branchfrom develop, and merge back into develop and master • Created when all desired features for the next release have been merged back into develop • Supports preparation of a new production release • Setting up meta-data such as version numbers or database connections • Generating API documentation • Features for the next release can already merge back into develop 38 / 58
- 39.
- 40. Hint Whenever changes aremerged back into master, this is a new production release by definition! 40 / 78
- 41. Hotfix Branches • Branchfrom master, and merge back into develop and master • Created when a critical bug in a production release has to be resolved immediately • Other team members can continue working on new features or the next release 41 / 58
- 42.
- 43. Hint Unlike the twomain branches, all supporting branches will be merged and removed eventually! 43 / 78
- 44. References • Chacon, Straub.Pro Git. 2nd Edition. Apress, December 24, 2014. http://www.git-scm.com/doc • Vincent Driessen. A successful Git branchin model. http://nvie.com/posts/a-successful-git-branching- model/, January 5, 2010. • Atlassian. Gitflow Workflow. https://www.atlassian.com/git/workflows#!workflo w-gitflow, June 2014. 44 / 58
- 45. Thank you foryour attention! Contact Mail dev@npruehs.de Blog http://www.npruehs.de Twitter @npruehs Github https://github.com/npruehs 45 / 58