Gitt and Git-flow
2 likes1,114 views
1. The document discusses Git and Git-Flow, including how to install Git and Git-Flow on Windows, Linux, and Mac systems. 2. It provides steps for initializing Git-Flow on a repository and describes the basic branches and workflows in Git-Flow like feature, release, and hotfix branches. 3. Git-Flow is used to manage development and releases through branches to allow multiple developers to work together and release versions through a clear branching model.
Ad
More Related Content
What's hot (20)
Similar to Gitt and Git-flow (20)
![[WroclawJUG] Continuous Delivery in OSS using Shipkit](https://cdn.slidesharecdn.com/ss_thumbnails/continuousdeliverywoss1-190403074306-thumbnail.jpg?width=560&fit=bounds)
Ad
Recently uploaded (20)
Ad
Gitt and Git-flow
- 1. Git and Git-Flow M.M.H.Masud Programmer at Granbury Solutions [email protected]
- 2. what we need for Git? (review) 1. Git installation in Windows 2. Git Installation in Linux & Mac 3. Git Bash for windows user 4. Terminal for Linux & Mac User
- 3. Git and Git-bash in Windows Installation: ● Goto the link http://git-scm.com/download/win ● Install and follow the steps with default settings ● after installation open git-bash (start->All programs- >git->Git Bash) ● Command line window will appear. ● type "git --version", it will show you the current git version
- 4. Git and Git-bash in Windows Git-Bash:
- 5. Git in Linux/Mac 1. Linux: type "sudo apt-get install git" in shell 2. Mac User: brew Install git
- 6. Git-Flow in windows 1. got to Git Bash 2. type "git clone --recursive git://github.com/nvie/gitflow.git" 3. now close git bash. 4. type "cmd" in start menu and then press Ctrl+shif+enter on Cmd icon to open it in administrative mode. 5. goto git-flow directory like: C:gitflow 6. type "contrib/msysgit-install.cmd" 7. it will install git-flow 8. now open git bash again and type git-flow 9. you will see list of option for git-flow 10. all done. Ready to start with git-flow
- 7. Git-Flow in Linux/Mac installing git-flow in Linux: =========================== type "sudo apt-get install git-flow" and all done installing git-flow in Mac: =========================== brew install git-flow
- 9. SSh Key add in Bitbucket Windows: - open git-bash - Type “ssh-keygen -t rsa "[email protected]" - Follow the steps - once generated, open the file: “cat ~/. ssh/id_rsa.pub” - copy the content - add the key to bitbucket (manage account -> ssh keys -> add key) - Done. Linux/Mac: - open Terminal - Type “ssh-keygen -t rsa "[email protected]" - Follow the steps - once generated, open the file: “cat ~/. ssh/id_rsa.pub” - copy the content - add the key to bitbucket (manage account -> ssh keys -> add key) - Done.
- 10. Git-Flow Init Prerequisite - a repository needs to be a git repository - master branch needs to be available in Bitbucket and local Start Git-flow: - “git-flow init” command needs to be run - it will create a ‘develop’ branch from master branch. - push the ‘develop’ branch to bitbucket. Ready to use Git-flow
- 11. Git-Flow Tools SourceTree for Mac and Windows. (picture: SourceTree) SmartSVN for Linux (non-commercial is free).
- 12. Git-Flow Master Branch Development Branch Feature Branch TPOS-101 TPOS-101 TPOS-101 TPOS-101 Release Branch release-v.1.0 release-v.2.0 Hotfix Branch rel-1.0-hotfix- TPOS-200 rel-1.0-hotfix- TPOS-200
- 14. Git-Flow Feature git-flow feature start TPOS-101 - start a branch from development branch git-flow feature finished TPOS-100 - merge the branch with Development branch git-flow feature finished -k TPOS-100 - -k : will not delete the branch after finish. git-flow feature publish TPOS-100 - push the branch to git DEVELOPER For any kind of JIRA ticket we will create a Feature branch
- 15. Git-Flow Release git-flow release start release-v.1.0 - start a branch from development branch git-flow release finished release-v.1.0 - merge the branch with Development branch - merge branch with master branch git-flow release finished -k release-v. 1.0 - -k : will not delete the branch after finish. git-flow release publish release-v.1.0 - push the branch to git RELEASE MANAGER
- 16. If Release branch has bug? 1. check out release-v.1.0 in local 2. create branch using GIT (NOT git-flow) ex: rel-v.1.0- TPOS-201 3. Fix the bug 4. Merge the branch with your local release branch release- v.1.0. 5. if ok, push the branch rel-v. 1.0-TPOS-201 in Bitbucket Next: - Create a Pull Request in Bitbucket with release-v.1.0
- 17. Release v.1.0 Test done. Next??? 1. Finish the Release v.1.0 2. it will merge release v.1.0 branch with local develop and master branch. 3. check everything in local 4. Push both branch in Bitbucket. 5. Tag the branch for future reference (most important) - check everything in Master branch (http://staging.grspos. net). - If everything works fine, make the release for production.
- 18. If Production has bug? :( Production related bug fix is commonly known as HOTFIX and GIT-FLOW manage it by himself git-flow hotfix start rel-1.0-hotfix- TPOS-301 - create branch from master git-flow hotfix publish rel-1.0-hotfix- TPOS-301 - push the branch in Bitbucket git-flow hotfix finish rel-1.0-hotfix- TPOS-301 - merge with develop - merge with master
- 19. Hotfix Workflow - Create hotfix branch using git- flow - publish the hotfix branch using git-flow publish - finish hotfix branch using git- flow - check everything in local - once everything is working fine, create two pull request to develop & master branch using bitbucket, like release branch. - Release master review pull request, and merge it with master and develop. NOTE: Don’t push Develop and master branch from local after hotfix finish
- 20. Future & QA - Create Git-Hook for Pre- commit and POST-Commit - Update Dev, Testing and Staging server automatically using bitbucket and git-hook