最近我设置了Laravel Forge，但我一直遇到部署问题。它总是在部署过程中抛出错误-我已经粘贴在下面。
我该如何解决这个问题？
U app/storage/logs/laravel.log
U vendor/autoload.php
U vendor/composer/autoload_classmap.php
U vendor/composer/autoload_real.php
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution, or use 'git commit -a'.
2条答案
按热度按时间ie3xauqp1#
“无法提取，因为您有未合并的文件。”
sxissh062#
只需在项目目录下的服务器上执行
git stash，就可以很好地部署了