[Bug] Import failing (2.0.0-beta.38)

[jmcpeak]

Trying to use lerna import. I saw in a few other issues that a rebase should be tried if import failed. I tried that first - no luck.

Here is the error message

lerna import /Users/mcpeakj/projects/document-ui
Lerna v2.0.0-beta.38
About to import 248 commits from /Users/mcpeakj/projects/document-ui into packages/document-ui
? Are you sure you want to import these commits onto the current branch? Yes
Errored while running ImportCommand.execute
Failed to apply commit 5745ce9.
Error: Command failed: git am -3
error: Failed to merge in the changes.

Rolling back to previous HEAD (commit 0515496).

This repo is hosted by JFrog/Artifactory, at my work - it is not a github repo.
I tried importing one of my public github repos and that worked fine.

lerna-debug.log.zip

[Robinfr]

I ran into the same problem when I tried to import a Git repository from a local path..

[jmcpeak]

So if the -B flag is added (https://git-scm.com/docs/git-format-patch#git-format-patch) a lot more information is outputted.

Applying: Get unit tests working and cleaned up Have the angular code follow controllerAs and bindToController syntax
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging packages/document-ui/gulp/tasks/inject.js
CONFLICT (content): Merge conflict in packages/document-ui/gulp/tasks/inject.js
Patch failed at 0001 Get unit tests working and cleaned up Have the angular code follow controllerAs and bindToController syntax
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

[evocateur]

@am80l Please don't add "+1" comments. If you have a reproducible example or other context, that would be very helpful.

[arthakdoo]

I added a pull request #1019 that fixes this issue.

[arthakdoo]

I think this issue can be closed as fixed since pull request #1019 was merged

[lock]

This thread has been automatically locked because there has not been any recent activity after it was closed. Please open a new issue for related bugs.