Branch indexing 20:04:35 Connecting to https://api.github.com using pharo-ci/****** (pharo-ci GitHub account) Connecting to https://api.github.com to check permissions of obtain list of tesonep for pharo-project/threadedFFI-Plugin Checking out git https://github.com/pharo-project/threadedFFI-Plugin.git into /net/www/ci/pharo-ci-jenkins2/workspace/threadedFFI-plugin_PR-12@script to read Jenkinsfile > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url https://github.com/pharo-project/threadedFFI-Plugin.git # timeout=10 Fetching without tags Fetching upstream changes from https://github.com/pharo-project/threadedFFI-Plugin.git > git --version # timeout=10 using GIT_ASKPASS to set credentials pharo-ci GitHub account > git fetch --no-tags --progress https://github.com/pharo-project/threadedFFI-Plugin.git +refs/pull/12/head:refs/remotes/origin/PR-12 +refs/heads/master:refs/remotes/origin/master Merging remotes/origin/master commit 977682838ce94ec7fbcade6e3ae41d01e3507e73 into PR head commit 613553571ff82135f8b14862a124a90dec3a7a65 > git config core.sparsecheckout # timeout=10 > git checkout -f 613553571ff82135f8b14862a124a90dec3a7a65 > git merge 977682838ce94ec7fbcade6e3ae41d01e3507e73 # timeout=10 > git config core.sparsecheckout # timeout=10 > git checkout -f 613553571ff82135f8b14862a124a90dec3a7a65 GitHub has been notified of this commit’s build result hudson.plugins.git.GitException: Command "git merge 977682838ce94ec7fbcade6e3ae41d01e3507e73" returned status code 1: stdout: Auto-merging CMakeLists.txt CONFLICT (content): Merge conflict in CMakeLists.txt Automatic merge failed; fix conflicts and then commit the result. stderr: at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2016) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1984) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1980) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1612) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:712) at jenkins.plugins.git.MergeWithGitSCMExtension.decorateRevisionToBuild(MergeWithGitSCMExtension.java:122) at hudson.plugins.git.GitSCM.determineRevisionToBuild(GitSCM.java:1094) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1187) at org.jenkinsci.plugins.workflow.steps.scm.SCMStep.checkout(SCMStep.java:120) at org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition.create(CpsScmFlowDefinition.java:144) at org.jenkinsci.plugins.workflow.multibranch.SCMBinder.create(SCMBinder.java:120) at org.jenkinsci.plugins.workflow.job.WorkflowRun.run(WorkflowRun.java:303) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Finished: FAILURE