合併錯誤，當部署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']; 
=======

來源

2014-11-03 Flugund

那麼，手動修復合併衝突。那麼它應該沒問題。 – 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

這是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

編輯：現在已經修復：https://github.com/symfony/symfony/pull/12382

來源

2014-11-03 12:25:28 Laurence

合併錯誤，當部署Laravel應用

回答

相關問題