<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Aug 16, 2018 at 10:40 AM, Andreas Wacknitz <span dir="ltr"><<a href="mailto:A.Wacknitz@gmx.de" target="_blank">A.Wacknitz@gmx.de</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class=""><br>
<br>
Am 16.08.2018 um 09:13 schrieb Michal Nowak:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Hi,<br>
<br>
it seems that our build server is not producing new illumos builds for a couple of days. The error at <a href="https://hipster.openindiana.org/logs/illumos-gate/latest/openindiana.illumos-gate.publish.log" rel="noreferrer" target="_blank">https://hipster.openindiana.or<wbr>g/logs/illumos-gate/latest/ope<wbr>nindiana.illumos-gate.publish.<wbr>log</a> is:<br>
<br>
>From git://<a href="http://github.com/illumos/illumos-gate" rel="noreferrer" target="_blank">github.com/illumos/illum<wbr>os-gate</a><br>
 * branch                  HEAD       -> FETCH_HEAD<br>
error: Your local changes to the following files would be overwritten by merge:<br>
    usr/src/lib/libc/port/mapf<wbr>ile-vers<br>
Please commit your changes or stash them before you merge.<br>
Aborting<br>
Updating 6640c13bea..9fed930b55<br>
<br>
Can someone with access to the build server fix it, please?<br>
</blockquote></span>
Alas, I can't. I have already tried to contact alp and xenol but no luck yet.<br></blockquote><div><br></div><div>Fixed.<br> <br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Regards,<br>
Andreas<div class="HOEnZb"><div class="h5"><br>
<br>
<br>
______________________________<wbr>_________________<br>
oi-dev mailing list<br>
<a href="mailto:oi-dev@openindiana.org" target="_blank">oi-dev@openindiana.org</a><br>
<a href="https://openindiana.org/mailman/listinfo/oi-dev" rel="noreferrer" target="_blank">https://openindiana.org/mailma<wbr>n/listinfo/oi-dev</a></div></div></blockquote></div><br><br clear="all"><br>-- <br><div class="gmail_signature" data-smartmail="gmail_signature"><div dir="ltr"><div><div dir="ltr"><font style="font-family:courier new,monospace" size="1">---<br>Praise the Caffeine embeddings<br></font></div></div></div></div>
</div></div>