[emfcompare-build] Build failed in Jenkins: master-build-on-egit-logical

[hudsonbuild@xxxxxxxxxxx]

See <https://ci.eclipse.org/emfcompare/job/master-build-on-egit-logical-nighlty/PLATFORM=oxygen-extras,jdk=jdk1.8.0-latest/641/display/redirect?page=changes>

Changes:

[laurent.goubet] Allow proxy resolution from the EMF Compare structure merge viewer

[laurent.goubet] Allow proxy resolution from the EMF Compare content merge viewers

[laurent.goubet] Proxy loading from the merge tool

------------------------------------------
Started by upstream project "master-build-on-egit-logical-nighlty" build number 641
originally caused by:
 Started by an SCM change
Building in workspace <https://ci.eclipse.org/emfcompare/job/master-build-on-egit-logical-nighlty/PLATFORM=oxygen-extras,jdk=jdk1.8.0-latest/ws/>
 > /usr/local/bin/git rev-parse --is-inside-work-tree # timeout=10
Fetching changes from the remote Git repository
 > /usr/local/bin/git config remote.origin.url /gitroot/emfcompare/org.eclipse.emf.compare.git # timeout=10
Fetching upstream changes from /gitroot/emfcompare/org.eclipse.emf.compare.git
 > /usr/local/bin/git --version # timeout=10
 > /usr/local/bin/git fetch --tags --progress /gitroot/emfcompare/org.eclipse.emf.compare.git +refs/heads/*:refs/remotes/origin/*
Checking out Revision d61ffe53a61faa42958a43fc2c93d3ce95bd0d94 (origin/master)
 > /usr/local/bin/git config core.sparsecheckout # timeout=10
 > /usr/local/bin/git checkout -f d61ffe53a61faa42958a43fc2c93d3ce95bd0d94
Commit message: "Proxy loading from the merge tool"
 > /usr/local/bin/git rev-list --no-walk c6c932d898c86d4efd9a216f25aa4789ced816a4 # timeout=10
Starting xvnc
[jdk1.8.0-latest] $ Xvnc :391 -geometry 1024x768 -depth 24 -ac -SecurityTypes none -noreset
[jdk1.8.0-latest] $ /bin/sh -xe /tmp/genie.emfcompare/jenkins550088652711759289.sh
+ echo 'We de-activate the git tests for now as they currently fail.'
We de-activate the git tests for now as they currently fail.
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/102981 patch-set 9'
>> Cherry-picking https://git.eclipse.org/r/#/c/102981 patch-set 9
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/81/102981/9

Xvnc TigerVNC 1.4.1 - built ??? ?? ???? ??:??:??
Copyright (C) 1999-2013 TigerVNC Team and many others (see README.txt)
See http://www.tigervnc.org for information on TigerVNC.
Underlying X server release 11502000, The X.Org Foundation

Initializing built-in extension VNC-EXTENSION
Initializing built-in extension Generic Event Extension
Initializing built-in extension SHAPE
Initializing built-in extension MIT-SHM
Initializing built-in extension XInputExtension
Initializing built-in extension XTEST
Initializing built-in extension BIG-REQUESTS
Initializing built-in extension SYNC
Initializing built-in extension XKEYBOARD
Initializing built-in extension XC-MISC
Initializing built-in extension XFIXES
Initializing built-in extension RENDER
Initializing built-in extension RANDR
Initializing built-in extension COMPOSITE
Initializing built-in extension DAMAGE
Initializing built-in extension MIT-SCREEN-SAVER
Initializing built-in extension DOUBLE-BUFFER
Initializing built-in extension RECORD
Initializing built-in extension DPMS
Initializing built-in extension Present
Initializing built-in extension X-Resource
Initializing built-in extension XVideo
Initializing built-in extension XVideo-MotionCompensation
Initializing built-in extension GLX

Mon Mar 19 22:00:57 2018
 vncext:      VNC extension running!
 vncext:      Listening for VNC connections on all interface(s), port 6291
 vncext:      created VNC server for screen 0
[dix] Could not init font path element /usr/share/fonts/TTF/, removing from list!
[dix] Could not init font path element /usr/share/fonts/OTF/, removing from list!
>From /gitroot/emfcompare/org.eclipse.emf.compare
 * branch            refs/changes/81/102981/9 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply 0950804... [516259] Introduce action to resolve multiple conflicts
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
Build step 'Execute shell' marked build as failure
Terminating xvnc.
Not sending mail to unregistered user laurent.goubet@xxxxxxx