Your branch and 'origin/master' have diverged.
Your branch and 'origin/master' have diverged.
Two approach to resolve this are :
git pull --rebase
or
Danger: You will scrap all your non-pushed data !!!
git reset --hard origin/master
Just another Yipp.ca Blogs site
Your branch and 'origin/master' have diverged.
Two approach to resolve this are :
git pull --rebase
or
Danger: You will scrap all your non-pushed data !!!
git reset --hard origin/master
Recent Comments