I was debugging a Laravel package (PDFMerge) that seemed to work on my local dev but not on my Forger remote server. I used Composer on the remote Forge server (vis SSH) to manually install the package again. Turned out that was not the issue, but since then all commits (via SourceTree/Bitbucket/Git) fail to sync on Forge, giving the following error:
error: Your local changes to the following files would be overwritten by merge: app/Http/Controllers/ReportsController.php composer.json composer.lock resources/views/chooseReport.blade.php Please commit your changes or stash them before you merge. Aborting
I tried overwriting the remote comoser.lock and composer.json files via FTP so that they'd match, to no avail. The error went unnoticed for an additional 9 commits of local dev, so now I don't know how to overcome the block on updating the Forge server and sync up the subsequent 9 commits to get back in sync.
Is there a correct way to do this? I can't find a consistent answer out there and am reluctant to start trying things and make this worse. Any recommendations are very welcome.
I'm running Laravel 5.5 on NGINX/MySQL locally with Laragon and remotely via Forge.
Thanks in advance for any assistance.