feature-1 develop Switched to a new branch "feature-1" # Depois de seus commits na branch da feature $ git checkout develop Switched to branch 'develop' $ git merge --no-ff feature-1 Updating ea1b82a..05e9557 (Summary of changes) # Remover a branch desnecessária $ git branch -d feature-1 Deleted branch feature-1 (was 05e9557). # Atualiza o repositório $ git push origin develop
branch "release-1.2" # Mudar a versão dos artefatos $ git commit -a -m "Bumped version number to 1.2" [release-1.2 74d9424] Bumped version number to 1.2 1 files changed, 1 insertions(+), 1 deletions(-) # Aplicar em master $ git checkout master Switched to branch 'master' $ git merge --no-ff release-1.2 Merge made by recursive. (Summary of changes) $ git tag -a 1.2 $ git checkout develop Switched to branch 'develop' $ git merge --no-ff release-1.2 Merge made by recursive. # Deletar a branch desnecessária $ git branch -d release-1.2
hotfix-1.2.1 master # Alteramos as versões dos artefatos $ git commit -a -m "Bumped version number to 1.2.1" # Aplicamos algumas correções $ git commit -m "Fixed severe production problem" # Aplicamos as correções em master $ git checkout master $ git merge --no-ff hotfix-1.2.1 # Criamos uma tag com a release da correção $ git tag -a 1.2.1 # Atualizamos develop com a correção atual $ git checkout develop $ git merge --no-ff hotfix-1.2.1 # Removemos a branch desnecessária $ git branch -d hotfix-1.2.1
must be created now. Branch name for production releases: [master] Branch name for "next release" development: [develop] How to name your supporting branch prefixes? Feature branches? [feature/] Release branches? [release/] Hotfix branches? [hotfix/] Support branches? [support/] Version tag prefix? []
flow feature start login # Altere os códigos necessários e commit $ git commit -m “Finalizada feature de login do sistema” # Finalize a release $ git flow feature finish login # Criar a feature de integração do login com o Google $ git flow feature start google-login # Altere os códigos necessários e commit $ git commit -m “Login integrado ao Google” # Finalize a release $ git flow feature finish google-login
v0.1.0 # Publique a release para o servidor $ git flow release publish v0.1.0 # Aplique as correções necessárias # Caso encontre algo de errado durante o QA da release # Finalize a sua release $ git flow release finish v0.1.0 # Envie as suas tags de release para o servidor $ git push --tags
# Aplique as correções necessárias # Finalize a sua release $ git flow hotfix finish v0.1.1 # Envie as suas tags de release para o servidor $ git push --tags