The document discusses git-flow, which is a git branching model. It provides a simple and merge-based solution for managing branches in git projects. The main elements of git-flow include branches for features, releases, hotfixes, and more. It also demonstrates how to use git-flow to implement new features, new releases, and hotfixes through branching and merging.

1. The git-flow way

2. What you will not get
how to use git
how to use github
why git
etc…
What you will get
work with git-flow
new way to think in git using

3. We don’t need git-flow
git is enough

4. Only one developer
commit
changed little
changed release version 1.0.0
start create awesome app
master

5. looks fine

6. Two developer
master
bug fix: sometimes crash
feature: whole new ui

7. looks fine

8. In the real world
picture from: http://www.ruanyifeng.com/blog/2012/07/git.html

9. WTF

10. What is git-flow
a set of git extensions
a simple git branching
model
merge based solution
picture from: http://nvie.com/posts/a-successful-git-branching-model/

11. Basic element
master must always be deployable
all changes made through feature branches (pr +
merge)
rebase to avoid/resolve conflicts; merge into master

12. Branches in git-flow
master: must always be deployable
develop: latest delivered development changes for
the next release
feature/xxx: new features
release/xxx: preparation of new production release
hotfix-xxx: critical bug fix in a production version

13. let’s get start

14. New feature
develop
feature/new-list
code review here
feature/discover
merge?

15. New feature
develop
feature/new-list
code review here
feature/discover

16. new skill get

17. Many features
picture from: http://www.ruanyifeng.com/blog/2012/07/git.html

18. ARE YOU
F**KING
KIDDINE ME

19. New feature
develop
feature/new-list
code review here
feature/discover
merge?

20. New feature
develop
feature/new-list
code review here
feature/discover
rebase

21. move to next

22. New release
develop
release/1.4.0
master
tag: 1.2.0 tag: 1.3.0 tag: 1.4.0
so easy

23. move to next

24. Hotfix
develop
hotfix/crash
master
tag: 1.2.0 tag: 1.2.1
so easy

25. Wanna know more
http://nvie.com/posts/a-successful-git-branching-
model/
http://danielkummer.github.io/git-flow-cheatsheet/
index.html
https://www.atlassian.com/git/tutorials/comparing-
workflows
https://gist.github.com/jbenet/ee6c9ac48068889b0912

26. Thanks