What I can do to resolve “1 commit behind master”?

Question

After pushing I\'ve been seeing this message at remote repository:

1 commit behind master.

This merge has conflicts that must be resolved before i

Answer 1

If your branch is behind by master then do:

git checkout master (you are switching your branch to master)
git pull 
git checkout yourBranch (switch back to your branch)
git merge master

After merging it, check if there is a conflict or not.
If there is NO CONFLICT then:

git push

If there is a conflict then fix your file(s), then:

git add yourFile(s)
git commit -m 'updating my branch'
git push