Git workflow for Andina DeFi

1-suggested-branch-naming-scheme.rb

# [jira-ticket-id]-[feature-name]
# All lowercase. Spaces replaced with dashes

123-rif-on-chain

2-initial-feature-branch-push.rb

# Pull newest updates from master
  git checkout master
  git pull origin master
# Create your feature branch
  git checkout -b 123-rif-on-chain
# ..work and commit some stuff.

# Commit to remote branches if needed (recommended).

# Ready to push? Okay. First, fix all conflicts between develop and 1234-my-new-feature on your local so we can simply fast-forward when we push.
  git fetch origin
  git rebase origin/develop
# QA on local machine. If updates, repeat previous step
# Merge your feature into develop. Also, let's squash it into one commit
  git checkout develop
  git merge 123-rif-on-chain
  git commit -m "added RIF on Chain"
# 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 123-rif-on-chain
# ..update and commit stuff
  git fetch origin
  git rebase origin/develop
# QA on local machine. If updates, repeat previous step
# Merge the updated branch into develop
  git checkout develop
  git merge 123-rif-on-chain
  git commit -m "updated RIF on Chain"
# Push
  git push

4-merging-develop-into-master.rb

# Fix all conflicts between develop and master before we merge
  git checkout develop
  git merge master
  git checkout master
  git merge -m 'Release 0.3.1+21 - Welcome RIF on Chain' develop
  git push
  
# We don't want to squash the develop commits on master 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