Build failed in Jenkins: jclouds » jclouds-chef #389

[BuildHive]

See <https://buildhive.cloudbees.com/job/jclouds/job/jclouds-chef/389/>

------------------------------------------
GitHub pull request #15 to jclouds/jclouds-chef
Building remotely on s-d6e51a6f in workspace 
<https://buildhive.cloudbees.com/job/jclouds/job/jclouds-chef/ws/>
Checkout:jclouds-chef / 
<https://buildhive.cloudbees.com/job/jclouds/job/jclouds-chef/ws/> - 
hudson.remoting.Channel@12cc0cf3:s-d6e51a6f
Using strategy: Build commits submitted for validated merge
Last Built Revision: Revision 2dabca6a29d0967b8bd26354b5371f46ead0ca50 
(origin/master)
Fetching changes from 1 remote Git repository
Fetching upstream changes from git://github.com/jclouds/jclouds-chef.git
  Opening connection
    Done: 0
  Counting objects
    Done: 13
  Finding sources
    Done: 13
  Getting sizes
    Done: 6
  Compressing objects
    Done: 5
  Writing objects
    Done: 13
Merging refs/tags/changes/389
FATAL: Could not merge refs/tags/changes/389
hudson.plugins.git.GitException: Could not merge refs/tags/changes/389
        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/389" returned status code 1:
stdout: Auto-merging core/src/test/java/org/jclouds/chef/ChefApiTest.java
CONFLICT (content): Merge conflict in 
core/src/test/java/org/jclouds/chef/ChefApiTest.java
Auto-merging core/src/test/java/org/jclouds/chef/ChefApiExpectTest.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