Git Problems: Difference between revisions
Jump to navigation
Jump to search
(Created page with "=Local and Remote Origin Branches Have Diverged without Activity on Local Branch= Normally this happens ... The solution is to throw away local "changes" - this implies we a...") |
No edit summary |
||
| Line 1: | Line 1: | ||
=Local and Remote Origin Branches Have Diverged without Activity on Local Branch= | =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 ... | 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. | 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. | ||
Revision as of 20:39, 20 September 2017
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.