Stage the files

git add <files>

Commit the files

git commit -m "<message subject>" -m "<message body, if needed>"

Pull the master

git pull origin master

Merge any conflicts and commit. Then,

git push origin master

Profit!