When do I need to do “git pull”, before or after “git add, git commit”?

Question

What is the right way?

git add foo.js
git commit foo.js -m \"commit\"
git pull
git push

Or

git pull
git add foo.js
git comm         


        

Answer 1

Best way for me is:

1. create new branch, checkout to it
2. create or modify files, git add, git commit
3. back to master branch and do pull from remote (to get latest master changes)
4. merge newly created branch with master
5. remove newly created branch
6. push master to remote

Or you can push newly created branch on remote and merge there (if you do it this way, at the end you need to pull from remote master)