dubbeltje
8 months ago
18
4
Forge

Laravel Forge pushing to master gives an error

Posted 8 months ago by dubbeltje

Hello Everyone,

I am trying to push my master branch which will trigger forge to deploy. However Forge gives me this error:

Sun Jan 13 20:42:18 UTC 2019
From bitbucket.org:xxxxxxxx/yyyyy
 * branch            master     -> FETCH_HEAD
   7e32660..310a40a  master     -> origin/master
error: Your local changes to the following files would be overwritten by merge:
    public/js/app.js
    public/mix-manifest.json
Please, commit your changes or stash them before you can merge.
Aborting
Updating f7ea17b..310a40a

Now I don't have anything special in my build script:

cd /home/forge/xxxxxxx.nl
git pull origin master
composer install --no-interaction --prefer-dist --optimize-autoloader
echo "" | sudo -S service php7.1-fpm reload

if [ -f artisan ]
then
    php artisan migrate --force
fi

So I am not sure how I should solve this. If i do git status on my master branche i get that there are no changes. So what should i do now?

Please sign in or create an account to participate in this conversation.