See <https://builds.apache.org/job/Cayenne%20pull%20requests/41/>
------------------------------------------ GitHub pull request #47 to apache/cayenne Building remotely on ubuntu-2 (docker Ubuntu ubuntu) in workspace <https://builds.apache.org/job/Cayenne%20pull%20requests/ws/> > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://github.com/apache/cayenne.git # timeout=10 Fetching upstream changes from git://github.com/apache/cayenne.git > git --version # timeout=10 > git fetch --tags --progress git://github.com/apache/cayenne.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 CAY-1946^{commit} # timeout=10 > git rev-parse CAY-1946_1^{commit} # timeout=10 > git rev-parse master^{commit} # timeout=10 > git rev-parse remotes/origin/4.0.M2_prerelease^{commit} # timeout=10 > git rev-parse remotes/origin/CAY-1946^{commit} # timeout=10 > git rev-parse remotes/origin/CAY-1946_1^{commit} # timeout=10 > git rev-parse remotes/origin/STABLE-3.0^{commit} # timeout=10 > git rev-parse remotes/origin/STABLE-3.1^{commit} # timeout=10 > git rev-parse remotes/origin/master^{commit} # timeout=10 > git branch -D master # timeout=10 > git checkout -b master origin/master Opening connection Done: 0 Counting objects Done: 42 Finding sources Done: 42 Getting sizes Done: 31 Compressing objects Done: 0 Writing objects Done: 42 remote: Resolving deltas remote: Updating references Merging refs/tags/changes/41 > git rev-parse refs/tags/changes/41^{commit} # timeout=10 > git merge 4ad9e8c26c5d20d938fa12135e997d6afd80d519 # timeout=10 FATAL: Could not merge AnyObjectId[4ad9e8c26c5d20d938fa12135e997d6afd80d519] hudson.plugins.git.GitException: Could not merge AnyObjectId[4ad9e8c26c5d20d938fa12135e997d6afd80d519] at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:469) at org.jenkinsci.plugins.gitclient.AbstractGitAPIImpl.merge(AbstractGitAPIImpl.java:76) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.merge(CliGitAPIImpl.java:85) 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 4ad9e8c26c5d20d938fa12135e997d6afd80d519" returned status code 1: stdout: Auto-merging modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderHelper.java Auto-merging cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportDbLoaderDelegate.java Auto-merging cayenne-server/src/main/java/org/apache/cayenne/map/DataMap.java Auto-merging cayenne-server/src/main/java/org/apache/cayenne/access/loader/filters/EntityFilters.java Auto-merging cayenne-server/src/main/java/org/apache/cayenne/access/loader/DefaultDbLoaderDelegate.java Auto-merging cayenne-server/src/main/java/org/apache/cayenne/access/DbLoaderDelegate.java Auto-merging cayenne-server/src/main/java/org/apache/cayenne/access/DbLoader.java CONFLICT (content): Merge conflict in cayenne-server/src/main/java/org/apache/cayenne/access/DbLoader.java Automatic merge failed; fix conflicts and then commit the result. stderr: at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1435) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1411) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1407) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1110) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1120) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:467) ... 17 more
