marlonpd
2/17/2018 - 2:35 AM

git error - master branch and 'origin/master' have diverged

git error - master branch and 'origin/master' have diverged

master branch and 'origin/master' have diverged

Solution

git reset --hard origin/master