I've seen this before. Try rebasing and force pushing. On Thu, Mar 29, 2018 at 3:51 PM, Indhu <indhubhara...@gmail.com> wrote:
> Hi, > > Looks like PR #10039 build failed because of git errors. Here is the error > log: > http://jenkins.mxnet-ci.amazon-ml.com/job/incubator- > mxnet/job/PR-10039/4/console. > Does someone know what could be happening here? > > Build error: > > Adding as 3rdparty/dlpack~7c28089749287f42ea8f41abd1358e6dbac54187 instead > Automatic merge failed; fix conflicts and then commit the result. > > stderr: > at > org.jenkinsci.plugins.gitclient.CliGitAPIImpl. > launchCommandIn(CliGitAPIImpl.java:1990) > at > org.jenkinsci.plugins.gitclient.CliGitAPIImpl. > launchCommandIn(CliGitAPIImpl.java:1958) > at > org.jenkinsci.plugins.gitclient.CliGitAPIImpl. > launchCommandIn(CliGitAPIImpl.java:1954) > at > org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl. > java:1592) > at > org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3. > execute(CliGitAPIImpl.java:692) > at > jenkins.plugins.git.MergeWithGitSCMExtension.decorateRevisionToBuild( > MergeWithGitSCMExtension.java:122) > at hudson.plugins.git.GitSCM.determineRevisionToBuild(GitSCM.java:1068) > at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1161) > at > org.jenkinsci.plugins.workflow.steps.scm.SCMStep. > checkout(SCMStep.java:113) > at > org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition.create( > CpsScmFlowDefinition.java:130) > at > org.jenkinsci.plugins.workflow.multibranch.SCMBinder.create(SCMBinder. > java:120) > at org.jenkinsci.plugins.workflow.job.WorkflowRun.run( > WorkflowRun.java:263) > at hudson.model.ResourceController.execute(ResourceController.java:97) > at hudson.model.Executor.run(Executor.java:429) > Finished: FAILURE > > Thanks, > Indu >
