My Git Workflow

git-workflow.markdown

Project workflow:

0. Load/Reload waffle.

• Get most current list of actions for the project.

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.

• Make sure multiple team members aren't working on the same issue; ensure everyone knows what each other is working on.

2. git checkout master
3. git pull origin master

• Ensure you're starting on the master branch and have the most recent changes pulled down.

4. run rspec

• Make sure there are no outstanding issues with code on master.

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

• Always be on a new branch when working on a feature (version control) - tagging it enables better integration with Waffle.

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

• TDD!

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

• Make sure your tests don't include syntax errors or other issues outside of the feature not yet existing.

8. commit your feature test

• Commit each step of the way.

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

• Show that you're making progress but it is a work-in-progress, allow comments and conversation around code.

10. start implementing the features

• Get to work.

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

• Keep current work available online. Hound is a Ruby style checker (configurable).

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.

• Constant communication with team members.

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

• Utilize good workflow.

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

• You've passed the tests you built based on the user stories.

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

• Fix any style issues.

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

• You're the trashman/woman.

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

• In Sinatra, run shotgun - visual double-check.

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

• Cover your bases.

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

• Means of cleaning up and consolidating commit history.

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

• Get most recent code from master into your branch.

21. Run rspec one more time

• Ensure no errors.

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

• No longer a work-in-progress. Do code review for a second set of eyes.

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

• Push to production.