You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by GitBox <gi...@apache.org> on 2018/03/14 23:46:39 UTC

[GitHub] eric-haibin-lin commented on issue #10112: [MXNET-16] [DO NOT MERGE] Move submodules to 3rdparty

eric-haibin-lin commented on issue #10112: [MXNET-16] [DO NOT MERGE] Move submodules to 3rdparty
URL: https://github.com/apache/incubator-mxnet/pull/10112#issuecomment-373212201
 
 
   @marcoabreu do you know why this happens on CI?
   ```
   GitHub has been notified of this commit’s build result
   
   
   
   hudson.plugins.git.GitException: Command "git merge 93e0ceb99724a06f30b8058b795e8427ba05fe41" returned status code 128:
   
   stdout: 
   
   stderr: error: Merging is not possible because you have unmerged files.
   
   hint: Fix them up in the work tree, and then use 'git add/rm <file>'
   
   hint: as appropriate to mark resolution and make a commit.
   
   fatal: Exiting because of an unresolved conflict.
   
   
   
   	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
   
   
   ```

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services