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/tdt-learning/workspace > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://github.com/SmartDataAnalytics/DL-Learner.git # timeout=10 Fetching upstream changes from git://github.com/SmartDataAnalytics/DL-Learner.git > git --version # timeout=10 > git fetch --tags --progress git://github.com/SmartDataAnalytics/DL-Learner.git +refs/heads/*:refs/remotes/origin/* > git rev-parse origin/tdt-learning^{commit} # timeout=10 Checking out Revision 2d978668a414d4367af775bada2188314d3870aa (origin/tdt-learning) > git config core.sparsecheckout # timeout=10 > git checkout -f 2d978668a414d4367af775bada2188314d3870aa 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/hudson4761000308337095927.sh + MASTER=develop + remote=origin + git name-rev --name-only --always HEAD + current_branch=remotes/origin/tdt-learning + merge_branch=jenkins/integration/remotes/origin/tdt-learning + git branch -D jenkins/integration/remotes/origin/tdt-learning Deleted branch jenkins/integration/remotes/origin/tdt-learning (was ce5743e). + git fetch -q origin refs/heads/develop + git checkout origin/develop Previous HEAD position was 2d97866... Bug fixing HEAD is now at c1d439b... minor fix + git checkout -b jenkins/integration/remotes/origin/tdt-learning Switched to a new branch 'jenkins/integration/remotes/origin/tdt-learning' + git clean -fdx + git merge --ff --no-edit --log --stat remotes/origin/tdt-learning Auto-merging components-core/src/main/java/org/dllearner/algorithms/decisiontrees/tdt/TDTClassifier.java CONFLICT (content): Merge conflict in components-core/src/main/java/org/dllearner/algorithms/decisiontrees/tdt/TDTClassifier.java Auto-merging components-core/src/main/java/org/dllearner/algorithms/decisiontrees/tdt/AbstractTDTClassifier.java CONFLICT (content): Merge conflict in components-core/src/main/java/org/dllearner/algorithms/decisiontrees/tdt/AbstractTDTClassifier.java Auto-merging components-core/src/main/java/org/dllearner/algorithms/decisiontrees/refinementoperators/DLTreesRefinementOperator.java CONFLICT (content): Merge conflict in components-core/src/main/java/org/dllearner/algorithms/decisiontrees/refinementoperators/DLTreesRefinementOperator.java Auto-merging components-core/src/main/java/org/dllearner/algorithms/decisiontrees/heuristics/TreeInductionHeuristics.java CONFLICT (content): Merge conflict in components-core/src/main/java/org/dllearner/algorithms/decisiontrees/heuristics/TreeInductionHeuristics.java Auto-merging components-core/src/main/java/org/dllearner/algorithms/decisiontrees/dsttdt/DSTTDTClassifier.java CONFLICT (content): Merge conflict in components-core/src/main/java/org/dllearner/algorithms/decisiontrees/dsttdt/DSTTDTClassifier.java 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)]] Warning: you have no plugins providing access control for builds, so falling back to legacy behavior of permitting any downstream builds to be triggered Finished: FAILURE