Git workflow
Download as ODP, PDF0 likes251 views
The document describes a git workflow process including creating new projects and branches for features, hotfixes, and releases. It also discusses using git stash to interrupt work on a feature branch to switch to a hotfix branch temporarily before returning to continue work on the feature.
Git workflow
- 1. 1 / 11 git workflowby Arif Akbarul Huda my experience working with git pic src : http://nvie.com
- 2. 2 / 11 Creating new project master Initial commit
- 3. 3 / 11 masterdevelop Initial commit Initial commit
- 4. 4 / 11 masterdevelopfeature/login Initial commit Build a login ui Integrating to API
- 5. 5 / 11 masterdevelopfeature/login Build a login ui Integrating to API Merge feature/login Into develop
- 6. 6 / 11 masterdevelopfeature/loginfeature/profil Build a profil ui Upload profile picture Integrating to APi
- 7. 7 / 11 masterdevelopfeature/loginfeature/profil Merge feature/profil Into develop
- 8. 8 / 11 masterdevelopfeature/loginfeature/profil Merge develop Into master Release with tag 0.0.1
- 9. 9 / 11 masterdevelopfeature/loginfeature/profil hotfix Fixbug failed upload photo Fix bug no connection When user login
- 10. 10 / 11 masterdevelopfeature/loginfeature/profil hotfix Merge hotfix Into master Release with tag 0.0.2
- 11. 11 / 11 masterdevelopfeature/search-the-doctors hotfix Merge hotfix Into master Release with tag 0.0.2 Git stash : Interupted Workflow Urgent switch to hotfix branch while working on feature branch # git checkout -b feature/search-the-doctors # … dirty branch to many unstagged files # git add . # git commit -m “my work in progress“ # git checkout -b hotfix # git checkout -b feature/search-the-doctors # … dirty branch to many unstagged files # git stash # git checkout -b hotfix # … work and commit on hotfix branch # git checkout feature/search-the-doctors # git stash pop #… welcome back the dirty branch to many unstagged files