1 # OneFlow - a Git branching model and workflow
2 See the original post [1][] for details.
5 - Only long-live branch.
6 - Let's call it `master`.
9 - New features and bugfixes for upcoming release.
10 - Cooperation, can be push forced.
12 ## Checkout from `master`
14 $ git checkout -b feature/my-feature master
19 $ git checkout feature/my-feature
20 $ git rebase -i master
22 $ git merge --no-ff feature/my-feature
23 $ git push origin master
24 $ git branch -d feature/my-feature
28 - Prepare project to be released.
30 ## Start from right commit on `master`
32 git checkout -b release/2.3.0 9efc5d
37 $ git checkout release/2.3.0
40 $ git merge --no-ff release/2.3.0
41 $ git push --tags origin master
42 $ git branch -d release/2.3.0
46 - For critical defect solutions.
48 ## Start from last version tag
50 $ git checkout -b hotfix/2.3.1 2.3.0
55 $ git checkout hotfix/2.3.1
58 $ git merge --no-ff hotfix/2.3.1
59 $ git push --tags origin master
60 $ git branch -d hotfix/2.3.1
63 [1]: http://endoflineblog.com/oneflow-a-git-branching-model-and-workflow