See <https://buildhive.cloudbees.com/job/jclouds/job/jclouds-labs/1828/>
------------------------------------------ GitHub pull request #107 to jclouds/jclouds-labs Building remotely on s-e1f5d91b in workspace <https://buildhive.cloudbees.com/job/jclouds/job/jclouds-labs/ws/> Fetching changes from the remote Git repository Fetching upstream changes from git://github.com/jclouds/jclouds-labs.git Opening connection Done: 0 Counting objects Done: 35 Finding sources Done: 35 Getting sizes Done: 33 Compressing objects Done: 0 Writing objects Done: 35 remote: Updating references Merging refs/tags/changes/1828 FATAL: Could not merge AnyObjectId[1789685d82230d8b4359af783cae1318f60e44c5] hudson.plugins.git.GitException: Could not merge AnyObjectId[1789685d82230d8b4359af783cae1318f60e44c5] at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$2.execute(CliGitAPIImpl.java:315) at org.jenkinsci.plugins.gitclient.AbstractGitAPIImpl.merge(AbstractGitAPIImpl.java:63) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.merge(CliGitAPIImpl.java:47) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at hudson.remoting.RemoteInvocationHandler$RPCRequest.perform(RemoteInvocationHandler.java:299) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:280) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:239) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:328) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:744) Caused by: hudson.plugins.git.GitException: Command "merge 1789685d82230d8b4359af783cae1318f60e44c5" returned status code 1: stdout: Auto-merging docker/src/test/java/org/jclouds/docker/features/RemoteApiLiveTest.java CONFLICT (content): Merge conflict in docker/src/test/java/org/jclouds/docker/features/RemoteApiLiveTest.java Auto-merging docker/src/test/java/org/jclouds/docker/compute/BaseDockerApiLiveTest.java CONFLICT (content): Merge conflict in docker/src/test/java/org/jclouds/docker/compute/BaseDockerApiLiveTest.java Automatic merge failed; fix conflicts and then commit the result. stderr: at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:928) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:909) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:853) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:863) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$2.execute(CliGitAPIImpl.java:313) ... 17 more
