git_workflow_ripest_tomatoes.md

Git Workflow Ripest Tomatoes.

1. Grab the SSH url at the ripest tomatoes github repo
2. Enter git clone <the_ssh_url> in your dev directory
3. cd into the rails project and create a new branch branch with git branch <yourname>
4. Switch to your newly created branch git checkout <yourname>
5. Do work.
6. When teammates tell you they've pushed working changes to master, git checkout master and pull from origin.
7. git checkout <yourname>
8. git rebase master

Steps for pushing your changes to the God repo:

The app is called 'your_app' and the user's name is 'jenny'

~/dev/your_app on jenny[!]

git add .

~/dev/your_app on jenny[+]

git commit -m “made some changes”

~/dev/your_app on jenny

git checkout master

~/dev/your_app on master

git pull origin master

~/dev/your_app on master

git checkout jenny

~/dev/your_app on jenny

git rebase master

~/dev/your_app on jenny

git checkout master

~/dev/your_app on master

git merge jenny

~/dev/your_app on master

git push origin master