我的第一次部署，所以我在云台上安装了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')