Build failed in Jenkins: Cayenne pull requests #20

[Apache Jenkins Server <je...@builds.apache.org>]

See <https://builds.apache.org/job/Cayenne%20pull%20requests/20/>

------------------------------------------
GitHub pull request #32 to apache/cayenne
Building remotely on ubuntu-5 (docker Ubuntu ubuntu5 ubuntu) in workspace <https://builds.apache.org/job/Cayenne%20pull%20requests/ws/>
 > git rev-parse --is-inside-work-tree
Fetching changes from the remote Git repository
 > git config remote.origin.url git://github.com/apache/cayenne.git
Fetching upstream changes from git://github.com/apache/cayenne.git
 > git --version
 > git fetch --tags --progress git://github.com/apache/cayenne.git +refs/heads/*:refs/remotes/origin/*
 > git config core.sparsecheckout
 > git checkout -f origin/master
 > git branch -a
 > git rev-parse master^{commit}
 > git rev-parse remotes/origin/CAY-1946^{commit}
 > git rev-parse remotes/origin/CAY-1946_1^{commit}
 > git rev-parse remotes/origin/STABLE-3.0^{commit}
 > git rev-parse remotes/origin/STABLE-3.1^{commit}
 > git rev-parse remotes/origin/master^{commit}
 > git branch -D master
 > git checkout -b master origin/master
  Opening connection
    Done: 0
  Counting objects
    Done: 2689
  Finding sources
    Done: 2689
  Getting sizes
    Done: 1336
  Compressing objects
    Done: 22360
  Writing objects
    Done: 2689
  remote: Resolving deltas
  remote: Updating references
Merging refs/tags/changes/20
 > git rev-parse refs/tags/changes/20^{commit}
 > git merge 368b4ac5d659e6659480a7c4852957b23333f00b
FATAL: Could not merge AnyObjectId[368b4ac5d659e6659480a7c4852957b23333f00b]
hudson.plugins.git.GitException: Could not merge AnyObjectId[368b4ac5d659e6659480a7c4852957b23333f00b]
	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:310)
	at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:290)
	at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:249)
	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 368b4ac5d659e6659480a7c4852957b23333f00b" returned status code 1:
stdout: Removing cayenne-server/src/test/resources/small-testmap.map.xml
Auto-merging cayenne-server/src/test/java/org/apache/cayenne/query/SelectByIdIT.java
CONFLICT (content): Merge conflict in cayenne-server/src/test/java/org/apache/cayenne/query/SelectByIdIT.java
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