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 the branch is behind master, then delete the remote branch. Then go to local branch and run :

git pull origin master --rebase

Then, again push the branch to origin:

git push -u origin