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: Your local changes to the following files would be overwritten by merge:
	usr/src/head/userdefs.h
Please commit your changes or stash them before you merge.
Aborting
Updating aefb332f56..35abe3277c
gmake[2]: Leaving directory '/jenkins/jobs/illumos-gate/workspace/components/openindiana/illumos-gate'