git flow init
Escribir nombres de ramas, prefijos de tags…
Sin flow
git init
git commit -allow-empty -m “start repo"
git checkout -b develop master
git remote add origin _url_
git flow feature start _name_
Sin flow
git checkout -b feature/_name_ develop
git flow feature publish _name_
Sin flow
git checkout feature/_name_
git push origin feature/_name_
git flow feature pull origin _name_
Sin flow
git checkout feature/_name_
git pull —rebase origin feature/_name_
git flow feature track _name_
git flow feature finish _name_
- Mergea a develop
- Borra la rama
- cambia la rama a develop
git push origin develop
git flow release start _name_
Sin flow
git checkout -b release/1.2.0 develop
git flow release publish _name_
Sin flow
git checkout release/_name_
git push origin release/_name_
git flow release finish _name_
Sin flow
git checkout master
git merge —no-ff release/_name_
git tag -a _name
git checkout develop
git merge —no-ff release/_name
git branch -d release/_name_
- Fusiona la rama en master
- Etiqueta con su nombre
- Fusiona con develop
- borra la publicación
git flow hot fix start name [commit]
Sin flow
git checkout -b hotfix/name [commit]
git flow hotfix finish _name_
Si flow
git checkout master
git merge —no-ff hotfix/_name_
git tag -a _name
git checkout develop
git merge —no-ff hotfix/_name_
git branch -d hotfix/_name_