See <https://buildhive.cloudbees.com/job/jclouds/job/jclouds/1056/>
------------------------------------------ GitHub pull request #339 to jclouds/jclouds Building remotely on s-acfafd80 in workspace <https://buildhive.cloudbees.com/job/jclouds/job/jclouds/ws/> Cloning the remote Git repository Cloning repository git://github.com/jclouds/jclouds.git git --version git version 1.7.11.7 Opening connection Done: 0 Counting objects Done: 372 Finding sources Done: 372 Getting sizes Done: 275 Compressing objects Done: 1909 Writing objects Done: 372 remote: Resolving deltas remote: Updating references Merging refs/tags/changes/1056 FATAL: Could not merge AnyObjectId[fa6b992858ea9ad65f1492e407f38a1b52c711b7] hudson.plugins.git.GitException: Could not merge AnyObjectId[fa6b992858ea9ad65f1492e407f38a1b52c711b7] 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 fa6b992858ea9ad65f1492e407f38a1b52c711b7" returned status code 1: stdout: Auto-merging apis/openstack-nova/pom.xml CONFLICT (content): Merge conflict in apis/openstack-nova/pom.xml 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
