php - 拉到 cloudways 时出现 Git 错误（Laravel 4 应用程序）

Question

我的第一次部署，所以我在 cloudways 上安装了 Laravel 4，我进行了第一次拉取，该应用程序正在运行，现在当我对我的 BitBucket 存储库进行小幅更改并再次拉取到 cloudways 时，它给了我以下错误：

Failed
Error doing git pull: ('Auto-merging bootstrap/start.php\nCONFLICT (add/add):  
Merge conflict in bootstrap/start.php\nAuto-merging app/routes.php\nCONFLICT 
(add/add): Merge conflict in app/routes.php\nAuto-merging 
app/config/local/database.php\nCONFLICT (add/add): Merge conflict in 
app/config/local/database.php\nAuto-merging app/config/database.php\nCONFLICT 
(add/add): Merge conflict in app/config/database.php\nAuto-merging 
app/config/app.php\nCONFLICT (add/add): Merge conflict in 
app/config/app.php\nAutomatic merge failed; fix conflicts and then commit the 
result.\n', 'From bitbucket.org:FatCowSoftware/pgtest\n * branch master -> 
FETCH_HEAD\n')