gmake[2]: Entering directory '/jenkins/jobs/illumos-gate/workspace/components/openindiana/illumos-gate'
warning: Pulling without specifying how to reconcile divergent branches is
discouraged. You can squelch this message by running one of the following
commands sometime before your next pull:

  git config pull.rebase false  # merge (the default strategy)
  git config pull.rebase true   # rebase
  git config pull.ff only       # fast-forward only

You can replace "git config" with "git config --global" to set a default
preference for all repositories. You can also pass --rebase, --no-rebase,
or --ff-only on the command line to override the configured default per
invocation.

From git://github.com/illumos/illumos-gate
 * branch                  HEAD       -> FETCH_HEAD
error: The following untracked working tree files would be overwritten by merge:
	usr/src/cmd/pools/poold/libjkstat/jkstat.h
	usr/src/cmd/pools/poold/libjlgrp/jlgrp.h
	usr/src/cmd/pools/poold/libjpool/jpool.h
	usr/src/cmd/pools/poold/libjsyslog/jsyslog.h
	usr/src/cmd/print/printmgr/com/sun/admin/pm/server/com_sun_admin_pm_server_DoPrinterNS.h
	usr/src/lib/libadt_jni/com/sun/audit/AuditSession.h
	usr/src/lib/libdtrace_jni/java/native/LocalConsumer.h
Please move or remove them before you merge.
Aborting
Updating 3d21c6bf20..51396a8ee7
gmake[2]: Leaving directory '/jenkins/jobs/illumos-gate/workspace/components/openindiana/illumos-gate'