[oi-dev] Build server not building new illumos

[Michal Nowak]

Hi,

it seems that our build server is not producing new illumos builds for a 
couple of days. The error at 
https://hipster.openindiana.org/logs/illumos-gate/latest/openindiana.illumos-gate.publish.log 
is:

 From git://github.com/illumos/illumos-gate
  * branch                  HEAD       -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by 
merge:
	usr/src/lib/libc/port/mapfile-vers
Please commit your changes or stash them before you merge.
Aborting
Updating 6640c13bea..9fed930b55

Can someone with access to the build server fix it, please?

Thanks,
Michal