Tri Tran
(Trần Đăng Trí)
Senior Technical Architect
.NFQ Asia
Co-Founder & Technical Lead
tablen.com
IdeasOn
I'm very happy if you call me Mụp
@moprit
Git Workflows
Centralized workflow
Feature-branches workflow
Gitflow workflow
Forking workflow
Centralized workflow
Like SVN (Subversion)
Using a central repository and single branch
For teams transitioning from SVN or Individual
Feature-branches workflow
1 master branch && feature branches
Merge pull request
For multiple developers to work on a particular feature, and single ENV
Gitflow workflow
Many public branches or separated ENV: master, staging, develop, etc…
Using feature branches and then merge pull request to a particular
Using release branches
For multiple developers to work on a multiple ENV
Forking workflow
Like Github - Open-source contribution
Using over two remote repositories
1 official repository
N developer repositories
Best Practices
Merge vs. Rebase
Merge
Merge vs. Rebase
Rebase
Merge vs. Rebase
The Golden Rule of Rebasing
Never use Rebase on public branches
Recommendations
References
Tri D. Tran
trandangtri@gmail.com
@moprit