git work process by @ajjahn

ajjahn_git_work_process.txt

git pull   # Start with latest upstream
git checkout -b myfeature   # Do some work in a separate branch
git add the_file
git commit -m 'blah blah blah'   # Make as many commits as needed
# Fetch and rebase when finished (or as often as you want before pushing local changes)
git fetch master   # Get any new upstream changes that may have been pushed
git rebase master   # Plop my commits on top of master/resolve any conflicts
git checkout master
git merge myfeature
git push