Build failed in Jenkins: IzPack project » izpack #870

[BuildHive]

See <https://buildhive.cloudbees.com/job/izpack/job/izpack/870/>

------------------------------------------
GitHub pull request #390 to izpack/izpack
Building remotely on s-c49fe9d5 in workspace <https://buildhive.cloudbees.com/job/izpack/job/izpack/ws/>
Fetching changes from the remote Git repository
Fetching upstream changes from git://github.com/izpack/izpack.git
Opening connection
Done: 0
Counting objects
Done: 41
Finding sources
Done: 41
Getting sizes
Done: 40
Compressing objects
Done: 75516
Writing objects
Done: 41
remote: Updating references
Merging refs/tags/changes/870
FATAL: Could not merge AnyObjectId[aed6f97ea296f38abf7c9a1fe2737513365a6f28]
hudson.plugins.git.GitException: Could not merge AnyObjectId[aed6f97ea296f38abf7c9a1fe2737513365a6f28]
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$2.execute(CliGitAPIImpl.java:315)
at org.jenkinsci.plugins.gitclient.AbstractGitAPIImpl.merge(AbstractGitAPIImpl.java:63)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.merge(CliGitAPIImpl.java:47)
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:744)
Caused by: hudson.plugins.git.GitException: Command "merge aed6f97ea296f38abf7c9a1fe2737513365a6f28" returned status code 1:
stdout: Auto-merging izpack-panel/src/main/java/com/izforge/izpack/panels/userinput/UserInputPanel.java
Auto-merging izpack-panel/pom.xml
Auto-merging izpack-gui/src/main/java/com/izforge/izpack/gui/GUIPrompt.java
CONFLICT (content): Merge conflict in izpack-gui/src/main/java/com/izforge/izpack/gui/GUIPrompt.java
Auto-merging izpack-core/src/main/resources/com/izforge/izpack/bin/langpacks/installer/eng.xml
Automatic merge failed; fix conflicts and then commit the result.

stderr:
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:928)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:909)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:853)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:863)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$2.execute(CliGitAPIImpl.java:313)
... 17 more