git-workflow.markdown

Project workflow:

0. Load/Reload waffle.

• Find all tasks

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.

• Pick out a specific task to work on

2. git checkout master

• Make sure you are on the master branch

3. git pull origin master

• Retrieve the most up-to-date version of the project

4. run rspec

• Check to see that all tests are passing

5. Checkout a new branch and tag it with #issue_number

• Create a new branch for working on a feature and identify that brancgh

6. Write the feature test associated with your waffle card.

• Setup a test to help structure the new feature you are about to add

7. Run rspec, and make sure that there are no errors that blow up the stack (missing ends, forgetting capitalization, etc.)

• Get your tests to a point where they are failing, and are do not have errors

8. commit your feature test

• Save the test you built locally

9. push this up to github, and create a [WIP] pull request.

• Save the test you built on github. WIP - Work In Progress

10. start implementing the features

• Get to work

11. when you commit, remember to push up to remote, and wait for hound to respond

• Hound checks your Ruby styling and syntax. Make sure to commit both locally and remotely

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.

• Reach out to others if you run into an issue

13. Correct the hound issues you have, go to step 10.

• Fix your issues and check to make sure they are gone now

14. When your feature test passes, commit and push up to GitHub. Wait for those hound requests to come back in.

• Commit your new changes are they are working

15. Deal with hound. Push up to Github. Repeat until hound is dealt with.

• Check to see if your syntax is OK and repeat if not

16. Search the project for binding.pry and save_and_open_pages leftover. Take those remnants out of the code.

• Remove your debugging techniques

17. Run rails s and see if everything looks and behaves like you want it to. Fix those and commit. Deal with hound.

• Fire up server and check to see if everything is running like you want

18. If there are really obvious sad paths for your feature test, you should write that test and return to Step 10.

• Ensure that everything work the way you expect

19. Rebase and squash the commits that you do not want record for posterity.

• Taking many commits and making them into one commit for one feature

20. Check if your branch comes from the latest master, and if not pull master into your branch.

• Make sure your work is current

21. Run rspec one more time

• Make sure code is still working after pulling in master

22. Remove [WIP] from pull request. If you're not paired, tag others and ping slack for a code review.

• Remove work in progress tag

23. After code is merged to master, remember to push to heroku with git push heroku master and heroku run rake db:migrate

• Finalize work