部署Laravel应用程序时出现合并错误

Question

嗨，我在将Laravel应用程序部署到staging时刚刚收到这个错误：

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'];
=======

Answer 1

这是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
    }

只需将其更改为：

vendor/symfony/routing/symfony/Component/routing/Route.php

       $this->schemes = $data['schemes'];
       $this->methods = $data['methods'];
       $this->condition = $data['condition'];
       if (isset($data['compiled'])) {
           $this->compiled = $data['compiled'];
       }
    }

这里还有一个Git pull来解决这个问题：https://github.com/symfony/Routing/pull/3

编辑：此问题现已修复：https://github.com/symfony/symfony/pull/12382