See <https://buildhive.cloudbees.com/job/jclouds/job/jclouds/550/>
------------------------------------------ GitHub pull request #181 to jclouds/jclouds Building remotely on s-317b7b93 in workspace <https://buildhive.cloudbees.com/job/jclouds/job/jclouds/ws/> Checkout:jclouds / <https://buildhive.cloudbees.com/job/jclouds/job/jclouds/ws/> - hudson.remoting.Channel@1f1c038b:s-317b7b93 Using strategy: Build commits submitted for validated merge Last Built Revision: Revision 1c9d1676cd7cc1ad3fe8b37b7f1ebf63d4efd81e (origin/master) Fetching changes from 1 remote Git repository Fetching upstream changes from git://github.com/jclouds/jclouds.git Opening connection Done: 0 Counting objects Done: 2 Finding sources Done: 2 Writing objects Done: 2 Merging refs/tags/changes/550 FATAL: Could not merge refs/tags/changes/550 hudson.plugins.git.GitException: Could not merge refs/tags/changes/550 at hudson.plugins.git.GitAPI.merge(GitAPI.java:351) at com.cloudbees.jenkins.plugins.git.vmerge.BuildChooserImpl.getCandidateRevisions(BuildChooserImpl.java:94) at hudson.plugins.git.GitSCM$2.invoke(GitSCM.java:1170) at hudson.plugins.git.GitSCM$2.invoke(GitSCM.java:1059) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:2154) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:287) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334) at java.util.concurrent.FutureTask.run(FutureTask.java:166) 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:724) Caused by: hudson.plugins.git.GitException: Command "git merge refs/tags/changes/550" returned status code 1: stdout: Auto-merging apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ServerApiLiveTest.java CONFLICT (content): Merge conflict in apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ServerApiLiveTest.java Auto-merging apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ServerApiExpectTest.java Automatic merge failed; fix conflicts and then commit the result. stderr: at hudson.plugins.git.GitAPI.launchCommandIn(GitAPI.java:779) at hudson.plugins.git.GitAPI.launchCommand(GitAPI.java:741) at hudson.plugins.git.GitAPI.launchCommand(GitAPI.java:751) at hudson.plugins.git.GitAPI.merge(GitAPI.java:349) ... 13 more
