合并错误,当部署Laravel应用
问题描述:
您好我刚刚得到这个错误,当我部署了我Laravel应用分期:合并错误,当部署Laravel应用
Symfony \ Component \ Debug \ Exception \ FatalErrorException (E_PARSE)
syntax error, unexpected '<<' (T_SL)
似乎是一个包中的合并冲突,任何想法?
Open: /var/www/ares/releases/20141103102236/vendor/symfony/routing/Symfony/Component/Routing/Route.php
$this->path = $data['path'];
$this->host = $data['host'];
$this->defaults = $data['defaults'];
$this->requirements = $data['requirements'];
$this->options = $data['options'];
$this->schemes = $data['schemes'];
$this->methods = $data['methods'];
<<<<<<< HEAD
$this->condition = $data['condition'];
=======
答
这是Symphony Routing文件中的一个临时性错误。
最近今天承诺似乎已包括Git的冲突到文件本身 - 在这里看到:
$this->schemes = $data['schemes'];
$this->methods = $data['methods'];
<<<<<<< HEAD
$this->condition = $data['condition'];
=======
if (isset($data['compiled'])) {
$this->compiled = $data['compiled'];
}
>>>>>>> 2.3
}
只需将它改成这样:
供应商/ symfony中/路由/ Symfony的/分量/路由/ Route.php
$this->schemes = $data['schemes'];
$this->methods = $data['methods'];
$this->condition = $data['condition'];
if (isset($data['compiled'])) {
$this->compiled = $data['compiled'];
}
}
还有一个Git拉来解决这里的问题:https://github.com/symfony/Routing/pull/3
那么,手动修复合并冲突。那么它应该没问题。 – majidarif 2014-11-03 10:36:01
你不应该将供应商文件夹提交给你的Git。你应该在你的服务器上运行'composer install' – Laurence 2014-11-03 10:38:41
https://github.com/symfony/Routing/blob/master/Route.php – Flugund 2014-11-03 10:44:11