raidenz/gitflow-breakdown.md

## gitflow-breakdown.md

      
    Raw
  

              gitflow-breakdown.md
            
          
    Initialize


gitflow
git


git flow init
git init


x
git commit --allow-empty -m "Initial commit"


x
git checkout -b develop master


Connect to the remote repository


gitflow
git


N/A
git remote add origin git@github.com:MYACCOUNT/MYREPO


Notes

While using GIT / Bitbucket PR (Pull Request Mode) You must publish your feature online
Then create PR, then delete it manually on local branch
Use git branch -r then git remote prune origin or git pull --prune
Features

Create a feature branch


gitflow
git


git flow feature start MYFEATURE
git checkout -b feature/MYFEATURE develop


Share a feature branch


gitflow
git


git flow feature publish MYFEATURE
git checkout feature/MYFEATURE


x
git push origin feature/MYFEATURE


Get latest for a feature branch


gitflow
git


git flow feature pull origin MYFEATURE
git checkout feature/MYFEATURE


x
git pull --rebase origin feature/MYFEATURE


Finalize a feature branch


gitflow
git


git flow feature finish MYFEATURE
git checkout develop


x
git merge --no-ff --no-edit feature/MYFEATURE


x
git branch -d feature/MYFEATURE


Finalize a feature branch Alternative fix conflict


gitflow
git alt


git flow feature finish MYFEATURE
git checkout feature/MYFEATURE


x
git merge --no-ff --no-edit develop


x
git push origin feature/MYFEATURE (merge online)


x
git checkout develop


x
git branch -d feature/MYFEATURE


Push the merged feature branch


gitflow
git


N/A
git push origin develop


x
git push origin :feature/MYFEATURE (if pushed)


Releases

Create a release branch


gitflow
git


git flow release start 1.2.0
git checkout -b release/1.2.0 develop


Share a release branch


gitflow
git


git flow release publish 1.2.0
git checkout release/1.2.0


x
git push origin release/1.2.0


Get latest for a release branch


gitflow
git


N/A
git checkout release/1.2.0


x
git pull --rebase origin release/1.2.0


Finalize a release branch


gitflow
git


git flow release finish 1.2.0
git checkout master


x
git merge --no-ff release/1.2.0


x
git tag -a 1.2.0


x
git checkout develop


x
git merge --no-ff release/1.2.0


x
git branch -d release/1.2.0


Push the merged feature branch


gitflow
git


N/A
git push origin master


x
git push origin develop


x
git push origin --tags


x
git push origin :release/1.2.0 (if pushed)


Hotfixes

Create a hotfix branch


gitflow
git


git flow hotfix start 1.2.1 [commit]
git checkout -b hotfix/1.2.1 [commit]


Finalize a hotfix branch


gitflow
git


git flow hotfix finish 1.2.1
git checkout master


x
git merge --no-ff hotfix/1.2.1


x
git tag -a 1.2.1


x
git checkout develop


x
git merge --no-ff hotfix/1.2.1


x
git branch -d hotfix/1.2.1


Push the merged hotfix branch


gitflow
git


N/A
git push origin master


x
git push origin develop


x
git push origin --tags


x
git push origin :hotfix/1.2.1 (if pushed)


Cheatsheet


https://danielkummer.github.io/git-flow-cheatsheet/
https://github.com/nvie/gitflow/wiki/Command-Line-Arguments

Cleaning


http://railsware.com/blog/2014/08/11/git-housekeeping-tutorial-clean-up-outdated-branches-in-local-and-remote-repositories/

References


http://nvie.com/posts/a-successful-git-branching-model/
https://help.github.com/articles/using-pull-requests#shared-repository-model
https://gist.github.com/JamesMGreene/cdd0ac49f90c987e45ac
Personal experience
gitflow	git
`git flow init`	`git init`
x	`git commit --allow-empty -m "Initial commit"`
x	`git checkout -b develop master`
gitflow	git
`git flow feature publish MYFEATURE`	`git checkout feature/MYFEATURE`
x	`git push origin feature/MYFEATURE`
gitflow	git
`git flow feature pull origin MYFEATURE`	`git checkout feature/MYFEATURE`
x	`git pull --rebase origin feature/MYFEATURE`
gitflow	git
`git flow feature finish MYFEATURE`	`git checkout develop`
x	`git merge --no-ff --no-edit feature/MYFEATURE`
x	`git branch -d feature/MYFEATURE`
gitflow	git alt
`git flow feature finish MYFEATURE`	`git checkout feature/MYFEATURE`
x	`git merge --no-ff --no-edit develop`
x	`git push origin feature/MYFEATURE` (merge online)
x	`git checkout develop`
x	`git branch -d feature/MYFEATURE`
gitflow	git
N/A	`git push origin develop`
x	`git push origin :feature/MYFEATURE` (if pushed)
gitflow	git
`git flow release publish 1.2.0`	`git checkout release/1.2.0`
x	`git push origin release/1.2.0`
gitflow	git
N/A	`git checkout release/1.2.0`
x	`git pull --rebase origin release/1.2.0`
gitflow	git
`git flow release finish 1.2.0`	`git checkout master`
x	`git merge --no-ff release/1.2.0`
x	`git tag -a 1.2.0`
x	`git checkout develop`
x	`git merge --no-ff release/1.2.0`
x	`git branch -d release/1.2.0`
gitflow	git
N/A	`git push origin master`
x	`git push origin develop`
x	`git push origin --tags`
x	`git push origin :release/1.2.0` (if pushed)