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

pull = fetch + merge.

You need to commit what you have done before merging.

So pull after commit.