0
的部署在單擊部署,我不斷收到以下錯誤消息:Laravel鍛造失敗,因爲Composer.lock
From github.com:my account
* branch master -> FETCH_HEAD
40fdcc7..8a338fb master -> origin/master
error: Your local changes to the following files would be overwritten by merge:
composer.lock
Please, commit your changes or stash them before you can merge.
Aborting
我試圖消除composer.lock,gitignore和composer.lock文件以及做git check,git stash,作曲家更新和作曲家安裝在服務器上,但這些命令或刪除都不起作用。
我在這裏錯過了什麼?