I have not been having that many problems deploying changes with Laravel Forge, until now. I'm kinda new to github and not sure what to do about this error (from Forge):
* branch master -> FETCH_HEAD e977ed3..b50e16a master -> origin/master error: Your local changes to the following files would be overwritten by merge: public/css/app.css public/css/style.min.css public/js/app.js public/mix-manifest.json Please commit your changes or stash them before you merge. Aborting
I read somewhere to do this on the server:
git checkout .
Not sure what that does and if it works or not.
Hope someone will be able to help me here :)