FailedConsole Output

Started by GitHub push by JensLehmann
Started by GitHub push by JensLehmann
Building on master in workspace /usr/share/tomcat6/.jenkins/jobs/DL-Learner Merge-M/branches/distributed/workspace
 > git rev-parse --is-inside-work-tree # timeout=10
Fetching changes from the remote Git repository
 > git config remote.origin.url git:// # timeout=10
Fetching upstream changes from git://
 > git --version # timeout=10
 > git fetch --tags --progress git:// +refs/heads/*:refs/remotes/origin/*
 > git rev-parse origin/distributed^{commit} # timeout=10
Checking out Revision cfd82e2f90aaa3fcef4ef2b0b08cba47fbfaa6e8 (origin/distributed)
 > git config core.sparsecheckout # timeout=10
 > git checkout -f cfd82e2f90aaa3fcef4ef2b0b08cba47fbfaa6e8
First time build. Skipping changelog.
Run condition [Not] preventing prebuild for step [[Set GitHub commit status (universal)]]
[workspace] $ /bin/sh -xe /tmp/tomcat6-tomcat6-tmp/
+ MASTER=develop
+ remote=origin
+ git name-rev --name-only --always HEAD
+ current_branch=remotes/origin/distributed
+ merge_branch=jenkins/integration/remotes/origin/distributed
+ git branch -D jenkins/integration/remotes/origin/distributed
Deleted branch jenkins/integration/remotes/origin/distributed (was ce5743e).
+ git fetch -q origin refs/heads/develop
+ git checkout origin/develop
Previous HEAD position was cfd82e2... added worker base time cmd args to examples
HEAD is now at c1d439b... minor fix
+ git checkout -b jenkins/integration/remotes/origin/distributed
Switched to a new branch 'jenkins/integration/remotes/origin/distributed'
+ git clean -fdx
+ git merge --ff --no-edit --log --stat remotes/origin/distributed
Auto-merging pom.xml
Auto-merging components-core/src/main/java/org/dllearner/core/
CONFLICT (content): Merge conflict in components-core/src/main/java/org/dllearner/core/
Auto-merging components-core/pom.xml
CONFLICT (content): Merge conflict in components-core/pom.xml
Automatic merge failed; fix conflicts and then commit the result.
Build step 'Execute shell' marked build as failure
[File exists] check if file exists [.git/MERGE_MODE]
Run condition [Not] preventing perform for step [[Set GitHub commit status (universal)]]
Finished: FAILURE