Git flow
- 1. Git Branching using GitFlow By: Alhaytham Alfeel & Ahmed Nafea
- 2. Version Control (VCS) A system to record changes to a file(s) over time. You can: ● recall specific versions, ● revert to previous state, ● compare changes ● or see who last modified something.
- 3. Evolution of VCS 1. Manual Copies 2. Local Version Control Systems (RCS) 3. Centralized Version Control Systems (CVS, Subversion) 4. Distributed Version Control Systems (Git, Mercurial)
- 4. VCS Branching ● Branching means you diverge from the main line of development and continue to do work without messing with that main line. ● Nearly every VCS has some form of branching support. ● Git branching: ❏ Lightweight (nearly instantaneous) ❏ Fast switching back and forth between branches.
- 5. GitFlow A branching model for Git, created by Vincent Driessen. It is very well suited to collaboration and scaling the development team.
- 6. this workflow uses two branches to record the history of the project master branch stores the official release history, develop branch serves as an integration branch for features. Feature Branches Each new feature should has its own branch Feature branches use develop as their parent branch. When a feature is complete, it merged back into develop. Features should never interact directly with master. Branch naming convention: anything except master, develop, release-*, or hotfix-* How Git Flow Works History Branches
- 7. ● Release Branches ● Once develop has full features ● Create Release branch from develop ● no new features can be added only bug fixes ● Once it’s ready to ship, the release gets merged into master and tagged with a version number. ● should be merged back into develop
- 8. Hotfix Branches Used to quickly Fix production Bug fork directly off of master Must merge back into: master and develop Branch naming convention: hotfix-* or hotfix/* should be tagged with an updated version number.