Your branch and ‘origin/master’ have diverged, and have 1 and 1 different commit each, respectively.


I got this problem:

1
2
3
4
5
6
λ git status
On branch master
Your branch and ‘origin/master’ have diverged,
and have 1 and 1 different commit each, respectively.
  (use "git pull" to merge the remote branch into yours)
nothing to commit, working directory clean

Solution

1
2
λ git reset –hard origin/master
HEAD is now at 63813ef fix localdb

Leave a Reply

Your email address will not be published. Required fields are marked *

This site uses Akismet to reduce spam. Learn how your comment data is processed.