Simple git commands for pushing up and pulling down

#There are many other ways to do this but i've found using these commands work best and are the least error prone

### How to pull down ###
git fetch origin master; git merge origin/master

    #If there is an error here, fix it with:
        #Open all conflict files, fix them, save them (you could use a diff tool here)
        git add .; git commit -m "Merged change"
        git fetch origin master; git merge origin/master

### How to push up ### (Always do the "pull down" steps before pushing up)
git add .; git commit -m "Updated files"; git push origin master

    #If there is an error here, fix it with:
        git fetch origin master; git merge origin/master
        #If there are conflicts, open all conflict files, fix them, save them (you could use a diff tool here)
        git push origin master