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/csampl/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/csampl^{commit} # timeout=10 Checking out Revision fccf166d85e373de2883619bbbb73190481f5f6a (origin/csampl) > git config core.sparsecheckout # timeout=10 > git checkout -f fccf166d85e373de2883619bbbb73190481f5f6a 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/csampl + merge_branch=jenkins/integration/remotes/origin/csampl + git branch -D jenkins/integration/remotes/origin/csampl Deleted branch jenkins/integration/remotes/origin/csampl (was a18c439). + git fetch -q origin refs/heads/develop + git checkout origin/develop Previous HEAD position was fccf166... handling sampling from ClassLearningProblem class, removed singleton pattern from CELOEPlusSampling HEAD is now at c1d439b... minor fix + git checkout -b jenkins/integration/remotes/origin/csampl Switched to a new branch 'jenkins/integration/remotes/origin/csampl' + git clean -fdx Removing components-core/log/ Removing components-core/target/ Removing components-ext/target/ Removing interfaces/log/ Removing interfaces/target/ Removing scripts/target/ + git merge --ff --no-edit --log --stat remotes/origin/csampl Auto-merging components-core/src/test/java/org/dllearner/learningproblems/ Auto-merging components-core/src/main/resources/ CONFLICT (content): Merge conflict in components-core/src/main/resources/ Auto-merging components-core/src/main/java/org/dllearner/refinementoperators/ CONFLICT (content): Merge conflict in components-core/src/main/java/org/dllearner/refinementoperators/ Auto-merging components-core/src/main/java/org/dllearner/learningproblems/ CONFLICT (content): Merge conflict in components-core/src/main/java/org/dllearner/learningproblems/ Auto-merging components-core/src/main/java/org/dllearner/algorithms/celoe/ Auto-merging components-core/src/main/java/org/dllearner/accuracymethods/ CONFLICT (content): Merge conflict in components-core/src/main/java/org/dllearner/accuracymethods/ 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