# example workflow
git pull --rebase=preserve origin master
git add filename
git commit -m "comment"
 
git push origin master