[prev in list] [next in list] [prev in thread] [next in thread]
List: asterisk-dev
Subject: Re: [asterisk-dev] git issues pulling asterisk 13, 14, 15, master branches
From: Dan Jenkins <dan.jenkins88 () gmail ! com>
Date: 2017-08-02 8:31:45
Message-ID: CAE89AUJ9Vu_LRKxZkCeB4V5eRTqefe2GqPLMd68ZuJUZ_5yi9Q () mail ! gmail ! com
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
We've all been there and done that :D
On Wed, Aug 2, 2017 at 1:39 AM, George Joseph <gjoseph@digium.com> wrote:
> 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
>
>
> --
> _____________________________________________________________________
> -- Bandwidth and Colocation Provided by http://www.api-digital.com --
>
> asterisk-dev mailing list
> To UNSUBSCRIBE or update options visit:
> http://lists.digium.com/mailman/listinfo/asterisk-dev
>
[Attachment #5 (text/html)]
<div dir="ltr">We've all been there and done that :D</div><div \
class="gmail_extra"><br><div class="gmail_quote">On Wed, Aug 2, 2017 at 1:39 AM, \
George Joseph <span dir="ltr"><<a href="mailto:gjoseph@digium.com" \
target="_blank">gjoseph@digium.com</a>></span> wrote:<br><blockquote \
class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex"><div dir="ltr"><div>I messed up. The next time you pull one \
of the asterisk branches from git you may get an error like \
this...</div><div><br></div><div><span \
style="color:rgb(40,40,40);font-family:"Open Sans","Helvetica \
Neue",sans-serif;font-size:14px;background-color:rgb(246,246,246)">Switched to \
branch 'master'</span><br \
style="box-sizing:border-box;color:rgb(40,40,40);font-family:"Open \
Sans","Helvetica \
Neue",sans-serif;font-size:14px;background-color:rgb(246,246,246)"><span \
style="color:rgb(40,40,40);font-family:"Open Sans","Helvetica \
Neue",sans-serif;font-size:14px;background-color:rgb(246,246,246)">Your branch \
and 'origin/master' have diverged,</span><br \
style="box-sizing:border-box;color:rgb(40,40,40);font-family:"Open \
Sans","Helvetica \
Neue",sans-serif;font-size:14px;background-color:rgb(246,246,246)"><span \
style="color:rgb(40,40,40);font-family:"Open Sans","Helvetica \
Neue",sans-serif;font-size:14px;background-color:rgb(246,246,246)">and have 10 \
and 6 different commits each, respectively.</span><br \
style="box-sizing:border-box;color:rgb(40,40,40);font-family:"Open \
Sans","Helvetica \
Neue",sans-serif;font-size:14px;background-color:rgb(246,246,246)"><span \
style="color:rgb(40,40,40);font-family:"Open Sans","Helvetica \
Neue",sans-serif;font-size:14px;background-color:rgb(246,246,246)">(use \
"git pull" to merge the remote branch into yours)</span><br></div><br \
clear="all"><div>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.</div><div><br></div><div>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.</div><div><br></div><div>Sorry for the \
confusion.</div><span class="HOEnZb"><font color="#888888"><div><br></div>-- <br><div \
class="m_3413745624175835450gmail_signature"><div dir="ltr"><span \
style="font-size:12.8px">George Joseph</span><br style="font-size:12.8px"><span \
style="font-size:12.8px">Digium, Inc. | Software Developer</span><span \
style="font-size:12.8px"><br>445 Jan Davis Drive NW - Huntsville, AL 35806 - \
US<br></span><span style="font-size:12.8px">Check us out at: </span><a \
href="http://www.digium.com/" rel="noreferrer" \
style="color:rgb(17,85,204);font-size:12.8px" target="_blank">www.digium.com</a><span \
style="font-size:12.8px"> & </span><a href="http://www.asterisk.org/" \
rel="noreferrer" style="color:rgb(17,85,204);font-size:12.8px" \
target="_blank">www.<wbr>asterisk.org</a><br><div><br></div></div></div> \
</font></span></div> <br>--<br>
______________________________<wbr>______________________________<wbr>_________<br>
-- Bandwidth and Colocation Provided by <a href="http://www.api-digital.com" \
rel="noreferrer" target="_blank">http://www.api-digital.com</a> --<br> <br>
asterisk-dev mailing list<br>
To UNSUBSCRIBE or update options visit:<br>
<a href="http://lists.digium.com/mailman/listinfo/asterisk-dev" rel="noreferrer" \
target="_blank">http://lists.digium.com/<wbr>mailman/listinfo/asterisk-dev</a><br></blockquote></div><br></div>
--
_____________________________________________________________________
-- Bandwidth and Colocation Provided by http://www.api-digital.com --
asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/asterisk-dev
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic