workflow to date.

local

typically, I start the morning off with: 

$ cd cls3/
move to whichever/or create branch
$ git fetch 
$ git pull origin master 
bundle 
$ mysql.server start 
$rails s

when creating a branch /pushing pulling

cls3(master)$ git fetch
cls3(master)$ git checkout -b CL-757 origin/sprint015
the checkout -b CL-757 is the story and the origin/spring015 is the branch we're branching off of. 
first. 
git add <file>
git commit -m <message>
git push origin <branch name>
git status? 
git checkout origin/sprint015 
git merge CL-757
git push origin sprint015