【发布时间】:2020-11-30 16:34:36
【问题描述】:
在这种情况下,我对依赖有所了解。
我在 CLI 上有这个警告
int: Use 'git am --show-current-patch' to see the failed patch
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Patch failed at 0006 Modified resources
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
有人可以帮我解释一下警告吗?
提前谢谢你。
【问题讨论】:
标签: laravel npm dependencies