It looks you made changes on your server that are not in your repo. Just reset the changes and then pull from the repo again.
git reset --hard
git pull
Be part of JetBrains PHPverse 2026 on June 9 – a free online event bringing PHP devs worldwide together.
Hi All,
I was trying to install Nova on production for a few days last week with no success...I have googled for instructions with very little information coming back to me! I am following documentation and being met with failed deployments in some cases and when deployments didn't fail I was met with a 403 forbidden error when trying to sign in.
3522e1e..6a8cce0 master -> origin/master
error: The following untracked working tree files would be overwritten by merge:
app/Nova/Resource.php
app/Nova/User.php
Please move or remove them before you merge.
Aborting
I have installed nova via composer... ran php artisan nova:install added my App\Nova folder (not sure if I was allowed to do this but I couldn't see another way to customise and create relationships with nova user) added migrations and added auth.json and no luck!
Anyone know of a step by step guide for using nova on production as I am getting a little bit impatient at all obstacles I'm meeting here! I am obviously missing some steps along the way!
PLEASE SEND HELP!
Please or to participate in this conversation.