git checkout working
-- do work
git add ...
git commit

to upload:

git checkout master
git pull ; usually unnecessary
git merge working
git push