pluskid commented on issue #10149: import Julia binding URL: https://github.com/apache/incubator-mxnet/pull/10149#issuecomment-425521205 I did the followings and found the conflicts in the rebase are mostly in README and travis updates. Those seem to be easy to fix. @iblis17 Can you do a rebase on your branch and fix those conflicts of your PR branch to enable proper rebase-merging? Thanks a lot! ``` git clone https://github.com/apache/incubator-mxnet.git cd incubator-mxnet git remote add iblis17 https://github.com/iblis17/incubator-mxnet.git git fetch iblis17 git checkout -b iblis17/julia-pkg git rebase master ... Auto-merging appveyor.yml CONFLICT (add/add): Merge conflict in appveyor.yml Auto-merging README.md CONFLICT (add/add): Merge conflict in README.md Auto-merging .travis.yml CONFLICT (add/add): Merge conflict in .travis.yml Auto-merging .gitignore CONFLICT (add/add): Merge conflict in .gitignore error: Failed to merge in the changes. ```
---------------------------------------------------------------- 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: [email protected] With regards, Apache Git Services
