Git workflow in Agine web 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

6. git add .
staging

7. staging
git add .

8. git commit -m ‘changed color on button’
stagingcommit

9. master
stagingcommit

10. git branch develop
master
stagingcommit
develop

11. git checkout develop
stagingcommit
master
develop

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!

17. stagingcommit
master
develop
commitcommitcommit

18. master
develop
git checkout master
stagingcommitcommitcommitcommit

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

21. master
git checkout master
stagingcommitcommitcommitcommit
com
m
it

22. master
stagingcommitcommitcommitcommit
com
m
it
git merge hotfix

23. master
stagingcommitcommitcommitcommit
com
m
it
git branch -d hotfix
develop

24. ok we’re done developing our
feature lets merge and deploy

25. master
stagingcommitcommitcommitcommit
com
m
it
develop

26. master
commitcommitcommitcommit
com
m
it
develop
git merge develop
com
m
it

27. git branch -d develop
master
commitcommitcommitcommit
com
m
it
com
m
it

28. master
commitcommitcommitcommit
com
m
it
com
m
it
staging