<html>
<head>
<meta content="text/html; charset=windows-1252"
http-equiv="Content-Type">
</head>
<body text="#000000" bgcolor="#FFFFFF">
in Opensim cloned today:<br>
What I see in avinationmerge's history:<br>
Last: 2015-10-01 15:47:32 change GetNewRezLocation physics ray
results processing (2abe1ccc59a9d9715a534509631ada86fec6497e (1)<br>
<br>
What I see in All Branch History<br>
in remotes/origin/avinationmerge <br>
Last 2015-10-14 05:06:17 fix a typo..
8d7fa62088d55e9bf714f1fa78646e216593c100 (2)<br>
<br>
The difference of repositories explains why the checkout of
avitionmerge stops at (1).<br>
<br>
<span id="result_box" class="" lang="en"><span class="hps">Conclusion</span><span
class="alt-edited">: master</span> <span class="hps">is blocked</span>
<span class="hps">waiting for a</span> <span class="hps">merge</span>
<span class="hps">with</span> <span class="hps alt-edited">avination</span><span>;</span>
<span class="hps alt-edited">avination</span> <span class="hps">stopped
and</span> <span class="hps">continues</span> <span
class="hps">on</span> <span class="hps">remote /</span> <span
class="hps">origin /</span> <span class="hps">avinationmerge</span>
<span class="hps">???<br>
<br>
GCI<br>
</span></span><br>
<div class="moz-cite-prefix">Le 14/10/2015 16:48, Fly Man a écrit :<br>
</div>
<blockquote
cite="mid:CAGqPXqcZOOsUKt-FfqE4KM5RbA6hiFKEy3OvfNRWj_MOOY1bVQ@mail.gmail.com"
type="cite">
<div dir="ltr">Perhaps the person that setup the Github
integration is willing to make sure that the avinationmerge tree
is also synced with Github then ?<br>
</div>
<div class="gmail_extra"><br>
<div class="gmail_quote">2015-10-10 18:15 GMT+02:00 Kevin Cozens
<span dir="ltr"><<a moz-do-not-send="true"
href="mailto:kevin@ve3syb.ca" target="_blank">kevin@ve3syb.ca</a>></span>:<br>
<blockquote class="gmail_quote" style="margin:0 0 0
.8ex;border-left:1px #ccc solid;padding-left:1ex"><span
class="">On 15-10-10 11:21 AM, GarminKawaguichi wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0
.8ex;border-left:1px #ccc solid;padding-left:1ex">
And last commit for avinationmerge on 2015-10-01
15:47:32 (change<br>
GetNewRezLocation …)<br>
</blockquote>
<br>
</span>
You need to update your copy of the avination merge branch.
The last commit was on October 8.<span class="HOEnZb"><font
color="#888888"><br>
<br>
-- <br>
Cheers!<br>
<br>
Kevin.<br>
<br>
<a moz-do-not-send="true" href="http://www.ve3syb.ca/"
rel="noreferrer" target="_blank">http://www.ve3syb.ca/</a>
|"Nerds make the shiny things that distract<br>
Owner of Elecraft K2 #2172 | the mouth-breathers,
and that's why we're<br>
| powerful!"<br>
#include <disclaimer/favourite> |
--Chris Hardwick</font></span>
<div class="HOEnZb">
<div class="h5"><br>
_______________________________________________<br>
Opensim-dev mailing list<br>
<a moz-do-not-send="true"
href="mailto:Opensim-dev@opensimulator.org"
target="_blank">Opensim-dev@opensimulator.org</a><br>
<a moz-do-not-send="true"
href="http://opensimulator.org/cgi-bin/mailman/listinfo/opensim-dev"
rel="noreferrer" target="_blank">http://opensimulator.org/cgi-bin/mailman/listinfo/opensim-dev</a><br>
</div>
</div>
</blockquote>
</div>
<br>
</div>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset>
<br>
<pre wrap="">_______________________________________________
Opensim-dev mailing list
<a class="moz-txt-link-abbreviated" href="mailto:Opensim-dev@opensimulator.org">Opensim-dev@opensimulator.org</a>
<a class="moz-txt-link-freetext" href="http://opensimulator.org/cgi-bin/mailman/listinfo/opensim-dev">http://opensimulator.org/cgi-bin/mailman/listinfo/opensim-dev</a>
</pre>
</blockquote>
</body>
</html>