GIT Workflow

Rob Laswick
April 25 2013
www.laswick.net

Please follow the recommended git workflow below:

Clone the git repository, if you haven't already

 git clone git@github.com:laswick/sam.git sam.git

Create a working branch to develop in
```
 git checkout -b working
```
Make your changes, experiment, and commit often
```
 git commit -a
```
When you're ready to push your changes to the server, first ensure your master branch is up to date
```
 git checkout master
 git pull
```
Once your master branch is up to date, merge in your changes
```
 git merge --squash working
```
Commit your changes, and BE SURE TO EDIT the commit log so it's meaningful
```
 git commit
```
Push your changes to the server
```
 git push
```

Continue your development from a clean slate

 git branch -D working
 git checkout -b working