Git Workflow lvl 2

1-excluding-commits-after-merge.rb

# ..just merged dev into stage
  git checkout stage
# on branch stage. We have a few blockers: we don't want commits 1234-my-feature [1a613sa] and 1234-my-feature-updated [2u817n0]
  git revert -n 1a613sa
  git revert -n 2u817n0
  git commit -m "... Except commits 1234-my-feature and 1234-my-feature-updates"
# The commits will now be excluded and can be fixed later
# Push
  git push

2-merging-stage-into-master.rb

# Fix all conflicts between stage and master before we merge
  git rebase master stage
  git checkout master
  git merge --squash stage
  git commit -m 'Release 15.05.20.1106 - Push description'
  git tag 15.05.20.1106
  git push --follow-tags
  
# 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