[asterisk-dev] git issues pulling asterisk 13, 14, 15, master branches

[George Joseph]

I messed up.  The next time you pull one of the asterisk branches from git
you may get an error like this...

Switched to branch 'master'
Your branch and 'origin/master' have diverged,
and have 10 and 6 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)

This was caused by my attempt to fix a commit message that happened last
week which, in turn, caused the commits since to be rebased.

To fix this, you can either delete the local branch you were trying to pull
and re-pull it, or reset your local branch before the offending
commit ("bundled_pjproject: Improve SSL/TLS error handling") with a "git
reset --hard HEAD~x" where "x" is how many commits back the offending
commit is, + 1, then re-pulling.   The branch delete and re-pull is easier
and probably safer.

Sorry for the confusion.

-- 
George Joseph
Digium, Inc. | Software Developer
445 Jan Davis Drive NW - Huntsville, AL 35806 - US
Check us out at: www.digium.com & www.asterisk.org
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-dev/attachments/20170801/ecab57b5/attachment-0001.html>