0
最近我設置了Laravel Forge,但我一直遇到部署問題。它在部署期間總是拋出錯誤 - 我在下面粘貼它們。Laravel Forge部署和Git的問題
我該如何解決這個問題? 「
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'.