git add -A
git commit -m "The feature I added"
git push -u origin master
This will
- Stage all the changed files
- Commit the staged files for pushing
- Push the changes to the repository
git pull origin master
Assuming you have no merge conflicts, this will give you the latest code from the master branch