Embed Size (px)
Citation preview
GIT
&
Branching ModelAuthor:
TU TranSkype: tranthanhtu83
Email: [email protected]
Blog: http://tranthanhtu.vn
- Overview about GIT- Perform basic action on GIT (window)- Perform basic action on SourceTree- Branching Model
Scope
TU Tran(skype: tranthanhtu83, mail: [email protected])
- GIT: https://git-scm.com/- GIT UI on Window : https://tortoisegit.org/- SourceTree: https://www.sourcetreeapp.com/- Reference:
http://www.tranthanhtu.vn/post/2017/01/11/git-branching-model
Resource
TU Tran(skype: tranthanhtu83, mail: [email protected])
Overview
DVCS vs CVCS
GIT
SourceTree
Branching Model
Agenda
TU Tran(skype: tranthanhtu83, mail: [email protected])
DVCS: Distributed Version Control SystemExample: Git, Mercurial
CVCS: Centralized Version Control SystemExample: CVS, Perforce, SVN
DVCS vs CVCS
TU Tran(skype: tranthanhtu83, mail: [email protected])
- Install GIT on local- Checkout code from remote- Create + push Branch- Merge Branch- Resolve Conflict- Ignore files
GIT
TU Tran(skype: tranthanhtu83, mail: [email protected])
- Install GIT on local- Checkout code from remote- Create + push Branch- Merge Branch- Resolve Conflict
SourceTree
TU Tran(skype: tranthanhtu83, mail: [email protected])
- Feature branch- Release branch- Tagging- Hotfix
Branching Model
TU Tran(skype: tranthanhtu83, mail: [email protected])
- Scenario: - Develop should not impact to others during implementing their
tasks/ features- Solution:
- Create new branch from develop- Implement your feature there- Merge back to develop when completed
Branching Model/ Feature branch
TU Tran(skype: tranthanhtu83, mail: [email protected])
- Scenario: - Completed features need to be tested before delivering to
customer- Other develops can continue on other features in parallel
- Solution:- Create new branch from develop- Test your complemented features and fix bugs- Merge to master, develop branches when ready for new release
Branching Model/ Release branch
TU Tran(skype: tranthanhtu83, mail: [email protected])
- Scenario: - We found bugs on production need to be fixed SAP
- Solution:- Create new branch from master- Fix bugs and re-test on staging- Merge to master, develop branches
Branching Model/ Hotfix branch
TU Tran(skype: tranthanhtu83, mail: [email protected])
- Scenario: - We need to maintain code of each version at the same time
- Solution:- Create new tag when release new version to customer
Branching Model/ Tagging
TU Tran(skype: tranthanhtu83, mail: [email protected])
