Git workflow for small teams

1-suggested-branch-naming-scheme.rb

# [pivital-story-id]-[feature-name]
# All lowercase. Spaces replaced with dashes

94198518-cs-block-bugs

2-initial-feature-branch-push.rb

# Pull newest updates from stage
  git checkout stage
  git pull origin stage
# Create your feature branch
  git checkout -b 1234-my-new-feature
# ..work and commit some stuff
# Ready to push? Okay. First, fix all conflicts between dev and 1234-my-new-feature on your local so we can simply fast-forward when we push.
  git fetch origin
  git rebase origin/dev
# QA on local machine. If updates, repeat previous step
# Merge your feature into dev. Also, let's squash it into one commit
  git checkout dev
  git merge --squash 1234-my-new-feature
  git commit -m "added My New Feature"
# Push
  git push

3-update-feature-branch-after-push.rb

# ..you need to push updates after QA
# Checkout your branch to make updates
  git checkout 1234-my-new-feature
# ..update and commit stuff
  git fetch origin
  git rebase origin/dev
# QA on local machine. If updates, repeat previous step
# Merge the updated branch into dev
  git checkout dev
  git merge --squash 1234-my-new-feature
  git commit -m "updated My New Feature"
# Push
  git push

4-merging-dev-into-stage.rb

# Fix all conflicts between dev and stage before we merge
  git checkout dev
  git merge stage
  git checkout stage
  git merge -m 'Release 15.05.13.1106 - Feature description' dev
  git push
  
# We don't want to squash the dev commits on stage so we can exclude any blockers when it comes time to push to master

5-delete-a-branch.rb

# [Optional] Delete local branch if you're done developing
  git branch -D 1234-my-new-feature

6-articles

http://stackoverflow.com/questions/457927/git-workflow-and-rebase-vs-merge-questions
http://stackoverflow.com/questions/1241720/git-cherry-pick-vs-merge-workflow