Support the ongoing development of Laravel.io →
posted 10 years ago
Configuration
Last updated 2 years ago.
0

It is a git conflict. You can check the latest deployment log to figure out the error.

Last updated 2 years ago.
0

Thanks, yeah, when I got into the server and did git status, I saw that it was off by some 30+ commits. Not sure how that happened. Since staging is the intermediate between dev and prod, I just did a hard reset as described here http://stackoverflow.com/q/1125968/1440617. All I had to do after that was redo my .env.php file on the staging server.

That seems to have taken care of the issue. Thanks for the reply.

Last updated 2 years ago.
0

Sign in to participate in this thread!

Eventy

Your banner here too?

heidilux heidilux Joined 3 Mar 2014

Moderators

We'd like to thank these amazing companies for supporting us

Your logo here?

Laravel.io

The Laravel portal for problem solving, knowledge sharing and community building.

© 2024 Laravel.io - All rights reserved.