Created
May 12, 2016 08:08
-
-
Save ManWithBear/49dd9d748de16da54ac7df36924b0062 to your computer and use it in GitHub Desktop.
Git flow model
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
git checkout develop | |
git merge --squash feature/... | |
git commit -am '#issue comment' | |
git push origin develop | |
git branch -D feature/... | |
git push origin :feature/... | |
In result flow like: | |
* <1234567> 2016-05-06 [dev1] (HEAD, origin/develop, develop) version bump | |
| * <1234567> 2016-05-06 [dev1] (tag: 1.52, master, origin/master) Merge branch 'develop' | |
| |\ | |
| |/ | |
|/| | |
* | <1234567> 2016-05-06 [dev1] #99 feature 99 | |
* | <1234567> 2016-05-05 [dev2] #98 feature 98 | |
* | <1234567> 2016-05-04 [dev1] version bump | |
| * <1234567> 2016-05-04 [dev1] (tag: 1.51) Merge branch 'develop' | |
| |\ | |
| |/ | |
|/| | |
* | <1234567> 2016-05-04 [dev1] #97 feature 97 | |
* | <1234567> 2016-05-03 [dev2] #96 feature 96 | |
* | <1234567> 2016-05-02 [dev1] version bump | |
| * <1234567> 2016-05-02 [dev1] (tag: 1.50) Merge branch 'develop' | |
| |\ | |
| |/ | |
|/| | |
* | <1234567> 2016-05-02 [dev1] #97 feature 96 | |
* | <1234567> 2016-05-01 [dev2] #96 feature 97 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment