Pivotal Git Flow

Checkout development branch and pull from remote

git checkout development
git pull origin development

Create working branch from development branch

STORY_TYPE - feature/bug/chore

SHORT_DESCRIPTION - meaningful name for branch based on story title
```
git checkout -b <STORY_TYPE>/<STORY_ID>_<SHORT_DESCRIPTION> development
```
Ex.
```
git checkout -b feature/155722581_allow_logo_remove development
```
Work in branch, commit changes and push to origin
When story completed checkout development branch and pull changes from remote
```
git checkout development
git pull origin development
```
Merge your branch into development with --no-ff option

Ex.
```
git merge --no-ff feature/155722581_allow_logo_remove
```
Push changes to remote server
```
git push origin development
```
Delete working branch from development branch

To delete a local branch.
```
git branch -d the_local_branch
```
To remove a remote branch (if you know what you are doing!).
```
git push origin :the_remote_branch
```
Or simply use the new syntax (v1.7.0).
```
git push origin --delete the_remote_branch
```

Start story in pivotal tracker and copy it id (STORY_ID).
Checkout master branch and pull from remote
```
git checkout master
git pull origin master
```
Create working branch from master branch

STORY_TYPE - bug

SHORT_DESCRIPTION - meaningful name for branch based on story title
```
git checkout -b <STORY_TYPE>/<STORY_ID>_<SHORT_DESCRIPTION> master
```
Ex.
```
git checkout -b bug/155722581_crash_on_dashboard master
```
Work in branch, commit changes and push to origin
When story completed checkout master branch and pull changes from remote
```
git checkout master
git pull origin master
```
Merge your branch into master with --no-ff option

Ex.
```
git merge --no-ff bug/155722581_crash_on_dashboard
```
Create tag with patch version

If previous version was 2.2 set new version to 2.2.1, if it was 2.2.1 set to 2.2.2.
```
git tag -a 2.2.1 -m '2.2.1'
git push origin 2.2.1 
```
Push changes to remote server
```
git push origin master
```

Checkout development branch and pull from remote

git checkout development
git pull origin development

Ex.

git merge --no-ff bug/155722581_crash_on_dashboard

Checkout development branch and pull from remote

git checkout development
git pull origin development

Create working branch from development branch

STORY_TYPE - release

SHORT_DESCRIPTION - meaningful name for branch based on story title

git checkout -b <STORY_TYPE>/<STORY_ID>_<SHORT_DESCRIPTION> development

Ex.

git checkout -b release/155722581_monday_5.03.18_release_2.3 development

Checkout master branch and pull from remote
```
git checkout master
git pull origin master
```

Merge your branch into master with --no-ff option

Ex.

git merge --no-ff release/155722581_monday_5.03.18_release_2.3

Checkout development branch and pull from remote

git checkout development
git pull origin development

Merge your branch into development with --no-ff option

Ex.

git merge --no-ff release/155722581_monday_5.03.18_release_2.3

VasylShevchenko/git_flow.md