创建Dev分支
git branch develop
git push -u origin develop
开发新Feature
开始开发新Feature
git checkout -b some-feature develop
git push -u origin some-feature
git status
git add some-file
git commit
完成Feature开发
git pull origin develop
git checkout develop
git merge --no-ff some-feature
git push origin develop
git branch -d some-feature
git push origin --delete some-feature
开发Release&Master
开始Release
git checkout –b release-0.1.0 develop
完成release
git checkout -b release-0.1.0 develop
git checkout mastergit merge --no-ff release-0.1.0
git pushgit checkout develop
git merge --no-ff release-0.1.0
git push
git branch -d release-0.1.0
git push origin --delete release-0.1.0
git tag -a v0.1.0 master
git push --tags
修复Master分支Bug
开始Hotfix
git checkout -b hotfix-0.1.1 master
完成Hotfix
git checkout master
git merge --no-ff hotfix-0.1.1
git push git checkout develop
git merge --no-ff hotfix-0.1.1
git push git branch -d hotfix-0.1.1
git tag -a v0.1.1 master
git push --tags