Skip to content

Console Output

Branch indexing
14:37:26 Connecting to https://api.github.com using sjoelund.se/****** (GitHub Access Token)
Connecting to https://api.github.com to check permissions of obtain list of bernhard-thiele for modelica/ModelicaSpecification
Checking out git https://github.com/modelica/ModelicaSpecification.git into /var/jenkins_home/workspace/on_ModelicaSpecification_PR-2307@script to read .CI/Jenkinsfile
using credential github
 > git rev-parse --is-inside-work-tree # timeout=10
Fetching changes from the remote Git repository
 > git config remote.origin.url https://github.com/modelica/ModelicaSpecification.git # timeout=10
Cleaning workspace
 > git rev-parse --verify HEAD # timeout=10
Resetting working tree
 > git reset --hard # timeout=10
 > git clean -fdx # timeout=10
Fetching without tags
Fetching upstream changes from https://github.com/modelica/ModelicaSpecification.git
 > git --version # timeout=10
using GIT_ASKPASS to set credentials GitHub Access Token
 > git fetch --no-tags --force --progress https://github.com/modelica/ModelicaSpecification.git +refs/pull/2307/head:refs/remotes/origin/PR-2307 +refs/heads/master:refs/remotes/origin/master # timeout=10
Merging remotes/origin/master commit 2522393319abcf91c1c08320bc5b49c19ac09c1b into PR head commit 75fccb9e37604430761df2be7dcb63b168f3c1e9
 > git config core.sparsecheckout # timeout=10
 > git checkout -f 75fccb9e37604430761df2be7dcb63b168f3c1e9 # timeout=10
 > git merge 2522393319abcf91c1c08320bc5b49c19ac09c1b # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f 75fccb9e37604430761df2be7dcb63b168f3c1e9 # timeout=10
ERROR: Checkout failed
hudson.plugins.git.GitException: Command "git merge 2522393319abcf91c1c08320bc5b49c19ac09c1b" returned status code 1:
stdout: Auto-merging chapters/functions.tex
CONFLICT (content): Merge conflict in chapters/functions.tex
Removing .travis_texlive.profile
Removing .travis_install.sh
Removing .travis.yml
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2318)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2248)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2244)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1777)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:802)
	at jenkins.plugins.git.MergeWithGitSCMExtension.decorateRevisionToBuild(MergeWithGitSCMExtension.java:122)
	at hudson.plugins.git.GitSCM.determineRevisionToBuild(GitSCM.java:1083)
	at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1176)
	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:142)
	at org.jenkinsci.plugins.workflow.job.WorkflowRun.run(WorkflowRun.java:293)
	at hudson.model.ResourceController.execute(ResourceController.java:97)
	at hudson.model.Executor.run(Executor.java:429)

GitHub has been notified of this commit’s build result

ERROR: Maximum checkout retry attempts reached, aborting
Finished: FAILURE