​​Git Workflow

​​Outline

​​In this tutorial, we will introduce
  • ​​3 widely adopted workflow
  • ​​Git Flow
  • ​​GitHub Flow
  • ​​GitLab Flow

​​Background

​​What and Why Git?

​​
 
User-uploaded image: Folder_Pizza.png
​​Been there, done that…
​​

​​What and Why Workflow?

​​
 
User-uploaded image: 1*_n16mieVkVFP0YazJVARPw.png
​​https://towardsdatascience.com/a-quick-primer-to-version-control-using-git-3fbdbb123262žœ
​​People have a hard time figuring out 
  • ​​which branch has the latest code
  • ​​or which branch to deploy to production.

​​How to collaborate with Git? 

​​
 
User-uploaded image: git-collaboration-8-638.jpg
​​https://www.slideshare.net/psquy/git-collaboration
​​
  • ​​We need a Workflow for Agile development!
​​
​​
​​  client-valued feature perspective 
​​→ feature/hotfix branch 
​​→ merge 
​​→ delete branch
​​
​​Also see more descriptions of Bitbucket Tutorials: Comparing Workflows
​​

​​1. Git Flow

​​A successful Git branching model
​​
 
User-uploaded image: image.png
​​
​​Main branches
  • ​​master​
  • ​​develop​
​​Supporting branches 
  1. ​​feature:  feature/feature-name​
  1. ​​hotfix:  hotfix-id​ 
  1. ​​release: release​ or r1.0.0​ or rc1.0.0​ (rc for release candidate)
​​

​​Real GitHub Examples:

​​
 
User-uploaded image: image.png
​​
​​
 
User-uploaded image: image.png
​​
​​