Git Flow
1. 创建dev分支
git branch dev
git push -u origin dev
2. 开始新的Feature开发
git checkout -b some-feature dev
git push -u origin some-feature
2.1. 做一些Feature改动
touch content > file1.txt
git add file1.txt
git commit -m "some-feature"
3. 完成Feature
git push origin dev
git checkout dev
git merge --no-ff some-feature
git push origin dev
git branch -d some-feature
git push origin --delete some-feature
4. 开始Release
git checkout -b release-0.1.0 dev
5. 完成Release
git checkout master
git merge --no-ff release-0.1.0
git push
git checkout dev
git merge --no-ff release-0.1.0
git push
git branch -d release-0.1.0
[git branch origin --delete release-0.1.0]
git tag -a v0.1.0 master
git push --tags
6. 开始Hotfix
git checkout -b hotfix-0.1.1 master
7. 完成Hotfix
git checkout master
git merge --no-ff hotfix-0.1.1
git push
git checkout dev
git merge --no-ff hotfix-0.1.1
git push
git branch -d hotfix-0.1.1
git tag -a 0.1.1 master
git push --tags
相关链接
2019, Apr 20
| 本文访问量： 次