See <https://builds.apache.org/job/Thrift-precommit/249/>
------------------------------------------ GitHub pull request #921 to apache/thrift [EnvInject] - Loading node environment variables. Building remotely on ubuntu-4 (docker Ubuntu ubuntu4 ubuntu yahoo-not-h2) in workspace <https://builds.apache.org/job/Thrift-precommit/ws/> > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url https://github.com/apache/thrift.git # > timeout=10 Fetching upstream changes from https://github.com/apache/thrift.git > git --version # timeout=10 > git -c core.askpass=true fetch --tags --progress > https://github.com/apache/thrift.git +refs/heads/*:refs/remotes/origin/* > git config core.sparsecheckout # timeout=10 > git checkout -f origin/master # timeout=10 > git branch -a # timeout=10 > git rev-parse master^{commit} # timeout=10 > git rev-parse remotes/origin/0.1.x^{commit} # timeout=10 > git rev-parse remotes/origin/0.2.x^{commit} # timeout=10 > git rev-parse remotes/origin/0.3.x^{commit} # timeout=10 > git rev-parse remotes/origin/0.4.x^{commit} # timeout=10 > git rev-parse remotes/origin/0.5.x^{commit} # timeout=10 > git rev-parse remotes/origin/0.6.x^{commit} # timeout=10 > git rev-parse remotes/origin/0.7.x^{commit} # timeout=10 > git rev-parse remotes/origin/0.8.x^{commit} # timeout=10 > git rev-parse remotes/origin/0.9.1^{commit} # timeout=10 > git rev-parse remotes/origin/0.9.2^{commit} # timeout=10 > git rev-parse remotes/origin/0.9.3^{commit} # timeout=10 > git rev-parse remotes/origin/0.9.x^{commit} # timeout=10 > git rev-parse remotes/origin/master^{commit} # timeout=10 > git rev-parse remotes/origin/py-compiler^{commit} # timeout=10 > git branch -D master # timeout=10 > git checkout -b master origin/master Opening connection Done: 0 Counting objects Done: 24 Finding sources Done: 24 Getting sizes Done: 13 Compressing objects Done: 0 Writing objects Done: 24 remote: Resolving deltas remote: Updating references Merging refs/tags/changes/249 > git rev-parse refs/tags/changes/249^{commit} # timeout=10 > git merge 2bb338c6e96abdc0bf0020e83ad7b1e76f29d43e # timeout=10 FATAL: Could not merge AnyObjectId[2bb338c6e96abdc0bf0020e83ad7b1e76f29d43e] hudson.plugins.git.GitException: Could not merge AnyObjectId[2bb338c6e96abdc0bf0020e83ad7b1e76f29d43e] at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:589) at org.jenkinsci.plugins.gitclient.AbstractGitAPIImpl.merge(AbstractGitAPIImpl.java:87) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.merge(CliGitAPIImpl.java:62) 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:608) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:583) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:542) at hudson.remoting.UserRequest.perform(UserRequest.java:120) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:326) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:68) 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:745) at ......remote call to ubuntu-4(Native Method) at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1416) at hudson.remoting.UserResponse.retrieve(UserRequest.java:220) at hudson.remoting.Channel.call(Channel.java:781) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:250) at com.sun.proxy.$Proxy63.merge(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.merge(RemoteGitImpl.java:438) at com.cloudbees.jenkins.plugins.git.vmerge.BuildChooserImpl.getCandidateRevisions(BuildChooserImpl.java:107) at hudson.plugins.git.GitSCM.determineRevisionToBuild(GitSCM.java:951) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1054) at hudson.scm.SCM.checkout(SCM.java:485) at hudson.model.AbstractProject.checkout(AbstractProject.java:1276) at hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:607) at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86) at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:529) at hudson.model.Run.execute(Run.java:1738) at hudson.model.FreeStyleBuild.run(FreeStyleBuild.java:43) at hudson.model.ResourceController.execute(ResourceController.java:98) at hudson.model.Executor.run(Executor.java:410) Caused by: hudson.plugins.git.GitException: Command "git merge 2bb338c6e96abdc0bf0020e83ad7b1e76f29d43e" returned status code 1: stdout: Auto-merging lib/c_glib/Makefile.am CONFLICT (content): Merge conflict in lib/c_glib/Makefile.am Automatic merge failed; fix conflicts and then commit the result. stderr: at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1693) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1669) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1665) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1307) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:587) at org.jenkinsci.plugins.gitclient.AbstractGitAPIImpl.merge(AbstractGitAPIImpl.java:87) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.merge(CliGitAPIImpl.java:62) 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:608) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:583) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:542) at hudson.remoting.UserRequest.perform(UserRequest.java:120) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:326) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:68) 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:745) [WARNINGS] Skipping publisher since build result is FAILURE [TASKS] Skipping publisher since build result is FAILURE Archiving artifacts Publishing Javadoc
