My Git Workflow

git-workflow.markdown

Project workflow:

0. Load/Reload waffle.
1. Choose a card from the backlog in waffle. If we're working separately, it's best to move that card that you've chosen into ready and perhaps assign it to yourself as well.
2. git checkout master
3. git pull origin master
4. run rspec
5. Checkout a new branch and tag it with #issue_number
6. Write the feature test associated with your waffle card.
7. Run rspec, and make sure that there are no errors that blow up the stack (missing ends, forgetting capitalization, etc.)
8. commit your feature test
9. push this up to github, and create a [WIP] pull request.
10. start implementing the features
11. when you commit, remember to push up to remote, and wait for hound to respond
12. If there is an issue, ping other people and make question comments with references on your pull request. Wait for aid. Remember to ping on the slack channel as well.
13. Correct the hound issues you have, go to step 10.
14. When your feature test passes, commit and push up to GitHub. Wait for those hound requests to come back in.
15. Deal with hound. Push up to Github. Repeat until hound is dealt with.
16. Search the project for binding.pry and save_and_open_pages leftover. Take those remnants out of the code.
17. Run rails s and see if everything looks and behaves like you want it to. Fix those and commit. Deal with hound.
18. If there are really obvious sad paths for your feature test, you should write that test and return to Step 10.
19. Rebase and squash the commits that you do not want record for posterity.
20. Check if your branch comes from the latest master, and if not pull master into your branch.
21. Run rspec one more time
22. Remove [WIP] from pull request. If you're not paired, tag others and ping slack for a code review.
23. After code is merged to master, remember to push to heroku with git push heroku master and heroku run rake db:migrate