Git Problems
Jump to navigation
Jump to search
Local and Remote Origin Branches Have Diverged without Activity on Local Branch
> git status On branch hq_sep Your branch and 'origin/hq_sep' have diverged, and have 25 and 61 different commits each, respectively. (use "git pull" to merge the remote branch into yours) nothing to commit, working tree clean
Normally this happens ...
The solution is to throw away local "changes" - this implies we are absolutely sure we did not interact with the local branch and we did not apply useful changes, and get in sync with the remote origin:
# be on the local branch git reset --hard origin/<remote-origin-branch>
git reset --hard origin/hq_sep