Skip to content

Instantly share code, notes, and snippets.

@cwebberOps
Last active August 29, 2015 14:01
Show Gist options
  • Save cwebberOps/7bec22e444a353db267b to your computer and use it in GitHub Desktop.
Save cwebberOps/7bec22e444a353db267b to your computer and use it in GitHub Desktop.
Pull Requests

Commit All The Things! - A Guide to Managing Pull Requests

Assumptions

  • All spec and kitchen tests have been added as needed
  • Code itself has been reviewed and verified
  • hub and stove are in use

Merging

Use the squash command below to merge the request onto the master branch.

#!/bin/bash

MERGEBRANCH=`git branch | grep ^'*' | awk '{ print $2 }'`
git checkout master
git merge --squash $MERGEBRANCH

To commit the change:

git commit -a -m '[COOK-<num>] - <ticket title>' --author '<author name>' --signoff

Push up the new master:

git push origin master

Releasing it

Use stove to bake the new cookbook...

bake <semver version goodness>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment