Skip to content

Instantly share code, notes, and snippets.

@jaredhirsch

jaredhirsch/gist:10426418

Last active August 29, 2015 13:58
Show Gist options
  • Save jaredhirsch/10426418 to your computer and use it in GitHub Desktop.
Save jaredhirsch/10426418 to your computer and use it in GitHub Desktop.
Download ZIP
dont fuck up merges to gaia
Raw
gistfile1.md

dont fuck up merges to gaia :neckbeard:

  1. do you have r+ from a peer?
  2. are all the tests green in travis?
  3. have you squashed all the commits?
  4. have you updated the commit log to include r=foo?
  5. is the commit log of the form "Bug XXXXXX - TITLE OF BUG r=foo" ?
  6. is the branch good to merge, or does it need to be rebased?

ok, go ahead and merge using the github interface.

then, following this sheriff merge comment, in the comment box:

  1. set status to fixed
  2. add a comment: Master: (url to the commit)
  3. set target milestone to the next 2.0 sprint
  4. set the flag status-b2g-2.0 to fixed.
  5. finally, click the 'Save Changes' button at the very bottom.

now you are done! and you didn't fuck anything up! 🍻

@jaredhirsch
Copy link
Author

Also, if the bug doesn't have [qa+] set in the whiteboard area, set that when you close it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment