See <https://builds.apache.org/job/Cayenne%20pull%20requests/380/display/redirect>
------------------------------------------ GitHub pull request #256 to apache/cayenne [EnvInject] - Loading node environment variables. Building remotely on H15 (Hadoop xenial) in workspace <https://builds.apache.org/job/Cayenne%20pull%20requests/ws/> > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://github.com/apache/cayenne.git # timeout=10 Fetching upstream changes from git://github.com/apache/cayenne.git > git --version # timeout=10 > git fetch --tags --progress git://github.com/apache/cayenne.git > +refs/heads/*:refs/remotes/origin/* > git config core.sparsecheckout # timeout=10 > git checkout -f origin/STABLE-4.0 > git branch -a -v --no-abbrev # timeout=10 > git checkout -b STABLE-4.0 origin/STABLE-4.0 Opening connection Done: 0 Counting objects Done: 368 Finding sources Done: 368 Getting sizes Done: 275 Compressing objects Done: 549055 Writing objects Done: 368 remote: Resolving deltas remote: Updating references Merging refs/tags/changes/380 > git rev-parse refs/tags/changes/380^{commit} # timeout=10 > git merge 5adcec965bd47168d9486d1999cf33ad39242acd # timeout=10 FATAL: Command "git merge 5adcec965bd47168d9486d1999cf33ad39242acd" returned status code 1: stdout: Auto-merging docs/doc/src/main/resources/RELEASE-NOTES.txt CONFLICT (content): Merge conflict in docs/doc/src/main/resources/RELEASE-NOTES.txt Automatic merge failed; fix conflicts and then commit the result. stderr: Also: hudson.remoting.Channel$CallSiteStackTrace: Remote call to H15 at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1693) at hudson.remoting.UserResponse.retrieve(UserRequest.java:310) at hudson.remoting.Channel.call(Channel.java:908) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:281) at com.sun.proxy.$Proxy110.merge(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.merge(RemoteGitImpl.java:435) at com.cloudbees.jenkins.plugins.git.vmerge.BuildChooserImpl.getCandidateRevisions(BuildChooserImpl.java:107) at hudson.plugins.git.GitSCM.determineRevisionToBuild(GitSCM.java:1017) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1124) at hudson.scm.SCM.checkout(SCM.java:495) at hudson.model.AbstractProject.checkout(AbstractProject.java:1202) at hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:574) at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86) at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:499) at hudson.model.Run.execute(Run.java:1724) at hudson.maven.MavenModuleSetBuild.run(MavenModuleSetBuild.java:543) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:421) hudson.plugins.git.GitException: Command "git merge 5adcec965bd47168d9486d1999cf33ad39242acd" returned status code 1: stdout: Auto-merging docs/doc/src/main/resources/RELEASE-NOTES.txt CONFLICT (content): Merge conflict in docs/doc/src/main/resources/RELEASE-NOTES.txt Automatic merge failed; fix conflicts and then commit the result. stderr: at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1970) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1938) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1934) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1572) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:672) at org.jenkinsci.plugins.gitclient.AbstractGitAPIImpl.merge(AbstractGitAPIImpl.java:86) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.merge(CliGitAPIImpl.java:71) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:498) at hudson.remoting.RemoteInvocationHandler$RPCRequest.perform(RemoteInvocationHandler.java:922) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:896) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:853) at hudson.remoting.UserRequest.perform(UserRequest.java:207) at hudson.remoting.UserRequest.perform(UserRequest.java:53) at hudson.remoting.Request$2.run(Request.java:358) 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:1142) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617) at java.lang.Thread.run(Thread.java:748) Putting comment on the pull request
