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

Suppose currently in your branch myBranch
Do the following :-

git status

If all changes are committed

git pull origin master

If changes are not committed than

git add .

git commit -m"commit changes"

git pull origin master

Check if there are any conflicts than resolve and commit changes

git add .

git commit -m"resolved conflicts message"

And than push

git push origin myBranch