... [Pipeline] { (Declarative: Checkout SCM) [Pipeline] checkout The recommended git tool is: git using credential ciuser-Git-User Fetching changes from the remote Git repository Using shallow fetch with depth 10 Cleaning workspace > git rev-parse --is-inside-work-tree # timeout=10 > git config remote.origin.url https://gitea.bla.com/ble/blu.git # timeout=10 > git rev-parse --verify HEAD # timeout=10 Resetting working tree > git reset --hard # timeout=10 > git clean -ffdx # timeout=10 Fetching upstream changes from https://gitea.bla.com/ble/blu.git > git --version # timeout=10 using GIT_ASKPASS to set credentials ciuser Git-User (Active Directory) > git fetch --no-tags --force --progress -- https://gitea.bla.com/ble/blu.git +refs/pull/1990/head:refs/remotes/origin/PR-1990 +refs/heads/branch/target:refs/remotes/origin/branch/target # timeout=10 Merging remotes/origin/branch/target commit 635e96e5c1fade59fb5016caebe53e73c70c0f1d into PR head commit 2a5e51c196d1314771d27408d5881480e93349c7 > git config core.sparsecheckout # timeout=10 > git checkout -f 2a5e51c196d1314771d27408d5881480e93349c7 # timeout=10 > git remote # timeout=10 > git config --get remote.origin.url # timeout=10 using GIT_ASKPASS to set credentials ciuser Git-User (Active Directory) > git merge 635e96e5c1fade59fb5016caebe53e73c70c0f1d # timeout=10 [Pipeline] } [Pipeline] // stage [Pipeline] } [Pipeline] // dir ... [Pipeline] End of Pipeline [Gitea] Notifying pull request build status: FAILURE There was a failure building this commit [Gitea] Notified Also: hudson.remoting.Channel$CallSiteStackTrace: Remote call to JNLP4-connect connection from XXXXXXXXXXXXXXXXXXXXXXXXXXXx at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1800) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:1001) at org.jenkinsci.plugins.gitclient.RemoteGitImpl$CommandInvocationHandler.execute(RemoteGitImpl.java:146) at sun.reflect.GeneratedMethodAccessor780.invoke(Unknown Source) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:498) at org.jenkinsci.plugins.gitclient.RemoteGitImpl$CommandInvocationHandler.invoke(RemoteGitImpl.java:132) at com.sun.proxy.$Proxy121.execute(Unknown Source) at jenkins.plugins.git.MergeWithGitSCMExtension.decorateRevisionToBuild(MergeWithGitSCMExtension.java:121) at hudson.plugins.git.GitSCM.determineRevisionToBuild(GitSCM.java:1159) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1298) at org.jenkinsci.plugins.workflow.steps.scm.SCMStep.checkout(SCMStep.java:125) at org.jenkinsci.plugins.workflow.steps.scm.SCMStep$StepExecutionImpl.run(SCMStep.java:93) at org.jenkinsci.plugins.workflow.steps.scm.SCMStep$StepExecutionImpl.run(SCMStep.java:80) at org.jenkinsci.plugins.workflow.steps.SynchronousNonBlockingStepExecution.lambda$start$0(SynchronousNonBlockingStepExecution.java:47) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) at java.util.concurrent.FutureTask.run(FutureTask.java:266) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) hudson.plugins.git.GitException: Command "git merge 635e96e5c1fade59fb5016caebe53e73c70c0f1d" returned status code 1: stdout: Auto-merging bla/ble/blu/Contracts.ts CONFLICT (content): Merge conflict in bla/ble/blu/Contracts.ts Automatic merge failed; fix conflicts and then commit the result. stderr: at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2450) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandWithCredentials(CliGitAPIImpl.java:2051) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandWithCredentials(CliGitAPIImpl.java:1951) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandWithCredentials(CliGitAPIImpl.java:1942) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.access$600(CliGitAPIImpl.java:84) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:910) at org.jenkinsci.plugins.gitclient.RemoteGitImpl$CommandInvocationHandler$GitCommandMasterToSlaveCallable.call(RemoteGitImpl.java:161) at org.jenkinsci.plugins.gitclient.RemoteGitImpl$CommandInvocationHandler$GitCommandMasterToSlaveCallable.call(RemoteGitImpl.java:154) at hudson.remoting.UserRequest.perform(UserRequest.java:211) at hudson.remoting.UserRequest.perform(UserRequest.java:54) at hudson.remoting.Request$2.run(Request.java:369) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:266) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at hudson.remoting.Engine$1.lambda$newThread$0(Engine.java:117) at java.lang.Thread.run(Thread.java:748) Finished: FAILURE