[Solved] git: Your branch and 'origin/master' have diverged, and have 1 and 3 different commits each, respectively.

[MakeTopSite]

... after I had removed last 3 commits and pushed to remote:

Code: Select all

git reset HEAD^ --hard
git reset HEAD^ --hard
git reset HEAD^ --hard
git push https://gitlab.com/myname/myproj  -f

Code: Select all

git status
On branch master
Your branch and 'origin/master' have diverged,
and have 1 and 3 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

nothing to commit, working tree clean

What will happen please if I run

Code: Select all

git pull

?

[MakeTopSite]

output of

Code: Select all

git pull

was empty but it has solved the problem.