See <https://builds.apache.org/job/Thrift-precommit/5/>
------------------------------------------ GitHub pull request #226 to apache/thrift Building remotely on ubuntu-4 (Ubuntu ubuntu4 ubuntu) in workspace <https://builds.apache.org/job/Thrift-precommit/ws/> Cloning the remote Git repository Cloning repository https://github.com/apache/thrift.git > git init <https://builds.apache.org/job/Thrift-precommit/ws/> Fetching upstream changes from https://github.com/apache/thrift.git > git --version > git fetch --tags --progress https://github.com/apache/thrift.git > +refs/heads/*:refs/remotes/origin/* > git config remote.origin.url https://github.com/apache/thrift.git > git config remote.origin.fetch +refs/heads/*:refs/remotes/origin/* > git config remote.origin.url https://github.com/apache/thrift.git Fetching upstream changes from https://github.com/apache/thrift.git > git fetch --tags --progress https://github.com/apache/thrift.git > +refs/heads/*:refs/remotes/origin/* > git config core.sparsecheckout > git checkout -f origin/master > git branch -a > git rev-parse remotes/origin/0.1.x^{commit} > git rev-parse remotes/origin/0.2.x^{commit} > git rev-parse remotes/origin/0.3.x^{commit} > git rev-parse remotes/origin/0.4.x^{commit} > git rev-parse remotes/origin/0.5.x^{commit} > git rev-parse remotes/origin/0.6.x^{commit} > git rev-parse remotes/origin/0.7.x^{commit} > git rev-parse remotes/origin/0.8.x^{commit} > git rev-parse remotes/origin/0.9.1^{commit} > git rev-parse remotes/origin/0.9.2^{commit} > git rev-parse remotes/origin/0.9.x^{commit} > git rev-parse remotes/origin/master^{commit} > git rev-parse remotes/origin/py-compiler^{commit} > git checkout -b master origin/master Opening connection Done: 0 Counting objects Done: 37354 Finding sources Done: 37354 Getting sizes Done: 7656 Compressing objects Done: 20388 Writing objects Done: 37354 remote: Resolving deltas remote: Updating references Merging refs/tags/changes/5 > git rev-parse refs/tags/changes/5^{commit} > git merge bc38223e0d5c3be513f798fc0351d0c64d3819b3 FATAL: Could not merge AnyObjectId[bc38223e0d5c3be513f798fc0351d0c64d3819b3] hudson.plugins.git.GitException: Could not merge AnyObjectId[bc38223e0d5c3be513f798fc0351d0c64d3819b3] at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:446) at org.jenkinsci.plugins.gitclient.AbstractGitAPIImpl.merge(AbstractGitAPIImpl.java:76) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.merge(CliGitAPIImpl.java:87) 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:745) Caused by: hudson.plugins.git.GitException: Command "git merge bc38223e0d5c3be513f798fc0351d0c64d3819b3" returned status code 1: stdout: Auto-merging compiler/cpp/src/generate/t_erl_generator.cc CONFLICT (content): Merge conflict in compiler/cpp/src/generate/t_erl_generator.cc Automatic merge failed; fix conflicts and then commit the result. stderr: at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1301) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1277) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1273) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1078) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1088) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:444) ... 17 more
