FailedConsole Output

Started by upstream project "LNT_Mirror_Merger" build number 381
originally caused by:
 Started by an SCM change
Building remotely on labmaster2 (Zorg) in workspace /Users/buildslave/jenkins/workspace/LNT_InnoDB_Merger
 > git rev-parse --is-inside-work-tree # timeout=10
Fetching changes from the remote Git repository
 > git config remote.github.url git@github.com:cmatthew/LNT-mirror.git # timeout=10
Fetching upstream changes from git@github.com:cmatthew/LNT-mirror.git
 > git --version # timeout=10
using GIT_SSH to set credentials Green Dragon Github automation key
 > git fetch --tags --progress git@github.com:cmatthew/LNT-mirror.git +refs/heads/*:refs/remotes/github/*
 > git rev-parse github/master^{commit} # timeout=10
Merging Revision 30b18e154df65d6add6856876a8c7e36b144f5c6 (github/master) to github/InnoDB, UserMergeOptions{mergeRemote='github', mergeTarget='InnoDB', mergeStrategy='default', fastForwardMode='--ff'}
 > git rev-parse github/InnoDB^{commit} # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f github/InnoDB
 > git merge --ff 30b18e154df65d6add6856876a8c7e36b144f5c6 # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f 30b18e154df65d6add6856876a8c7e36b144f5c6
ERROR: Branch not suitable for integration as it does not merge cleanly: Command "git merge --ff 30b18e154df65d6add6856876a8c7e36b144f5c6" returned status code 1:
stdout: Auto-merging lnt/server/ui/views.py
Auto-merging lnt/server/ui/templates/v4_machine.html
CONFLICT (content): Merge conflict in lnt/server/ui/templates/v4_machine.html
Automatic merge failed; fix conflicts and then commit the result.

Hide Details

stderr: Build did not succeed and the project is configured to only push after a successful build, so no pushing will occur. [BFA] Scanning build for known causes... [BFA] No failure causes found [BFA] Done. 0s Finished: FAILURE