Git workflow in agile development
2 likes1,855 views
This document provides an overview of Git workflow in agile development. It introduces basic Git commands like git init, git add, git commit, git branch, git checkout, and git merge. It then demonstrates how these commands can be used in a typical workflow involving feature branches, hotfix branches, and merging changes back into the master branch for deployment. Key steps shown include creating feature branches off of develop, pushing changes to those branches, merging the feature branches back into develop once complete, creating hotfix branches off of master as needed, and merging those hotfixes back to both master and develop.
![Basic Git Commands
git init - setup git in current directory!
git status - view current status!
git add . - adds files to staging area!
git branch [branch-name] - creates branch!
git checkout [branch-name] - change working branch to specified one!
git commit -m ‘message’ - creates a commit from staging!
git merge [branch-name] - merges specified branch into current!
git log - prints out a log of past commits](https://image.slidesharecdn.com/gitworkflowinagiledevelopment-140520040805-phpapp01/85/Git-workflow-in-agile-development-4-320.jpg)
Git workflow in agile development
- 1. Git Workflow in Agile Development Codemy.net presents
- 2. What is Git? Source Code Management
- 3. Why Git? Better Team Management More Efficient Workflow More Control
- 4. Basic Git Commands git init - setup git in current directory! git status - view current status! git add . - adds files to staging area! git branch [branch-name] - creates branch! git checkout [branch-name] - change working branch to specified one! git commit -m ‘message’ - creates a commit from staging! git merge [branch-name] - merges specified branch into current! git log - prints out a log of past commits
- 5. git init creates a .git folder in the current directory Master
- 8. git commit -m ‘changed color on button’ stagingcommit
- 12. git commit -am ‘blah blah’ stagingcommit master develop commit
- 13. stagingcommit master develop commitcommit git commit -am ‘blah blah again’
- 14. stagingcommit master develop commitcommitcommit git commit -am ‘blah blah and again’
- 15. oh noes! something went wrong with the site in production!
- 16. no problem!
- 19. master git checkout -b hotfix stagingcommitcommitcommitcommit checkout -b means create a new branch and switch to that branch
- 20. git commit -am ‘fix bug in production’ master stagingcommitcommitcommitcommit com m it
- 23. master stagingcommitcommitcommitcommit com m it git branch -d hotfix develop
- 24. ok we’re done developing our feature lets merge and deploy
- 27. git branch -d develop master commitcommitcommitcommit com m it com m it