Started by upstream project "LNT_Mirror_Merger" build number 380 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 # timeout=10 Fetching upstream changes from > git --version # timeout=10 using GIT_SSH to set credentials Green Dragon Github automation key > git fetch --tags --progress +refs/heads/*:refs/remotes/github/* > git rev-parse github/master^{commit} # timeout=10 Merging Revision 30d74a0f9136cf0c412decfbee543b51dd91795f (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 30d74a0f9136cf0c412decfbee543b51dd91795f # timeout=10 > git config core.sparsecheckout # timeout=10 > git checkout -f 30d74a0f9136cf0c412decfbee543b51dd91795f ERROR: Branch not suitable for integration as it does not merge cleanly: Command "git merge --ff 30d74a0f9136cf0c412decfbee543b51dd91795f" returned status code 1: stdout: Auto-merging lnt/server/ui/ 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