Upgrade from 3.2.7

[woohung]

Hello, folks!
I'm trying to upgrade from 3.2.7 to the latest version, the sudo git pull origin master command fails. Help, please, to understand where the error crept in? And what did I do wrong?

Ubuntu 22.04
Redis: 5.0.7
PSQL: 12.14
python: 3.8.10
Plugins:

• nextbox_ui_plugin

thx!

Already on 'master'
Your branch is up to date with 'origin/master'.

--- Above result from command `sudo git checkout master` ---

(venv) netbox@netbox:/opt/netbox$ sudo git pull origin master
remote: Enumerating objects: 105585, done.
remote: Counting objects: 100% (105584/105584), done.
remote: Compressing objects: 100% (21416/21416), done.
remote: Total 104652 (delta 84340), reused 103064 (delta 82896), pack-reused 0
Receiving objects: 100% (104652/104652), 61.55 MiB | 5.13 MiB/s, done.
Resolving deltas: 100% (84340/84340), completed with 697 local objects.
From https://github.com/netbox-community/netbox
 * branch            master     -> FETCH_HEAD
   f8cbd322b..5f184f243 master     -> origin/master
Updating f8cbd322b..5f184f243
error: Your local changes to the following files would be overwritten by merge:
        .github/ISSUE_TEMPLATE/bug_report.yaml
        .github/ISSUE_TEMPLATE/documentation_change.yaml
        .github/ISSUE_TEMPLATE/feature_request.yaml
        .github/PULL_REQUEST_TEMPLATE.md
        .github/workflows/ci.yml
        .github/workflows/lock.yml
        .github/workflows/stale.yml
        CONTRIBUTING.md
        README.md
        SECURITY.md
        base_requirements.txt
        contrib/apache.conf
        contrib/gunicorn.py
        docs/additional-features/change-logging.md
        docs/additional-features/journaling.md
        docs/additional-features/napalm.md
        docs/additional-features/prometheus-metrics.md
        docs/additional-features/webhooks.md
        docs/administration/authentication/overview.md
        docs/administration/error-reporting.md
        docs/administration/housekeeping.md
        docs/administration/permissions.md
        docs/configuration/dynamic-settings.md
        docs/configuration/index.md
        docs/configuration/optional-settings.md
        docs/configuration/remote-authentication.md
        docs/configuration/required-settings.md
        docs/core-functionality/circuits.md
        docs/core-functionality/contacts.md
        docs/core-functionality/device-types.md
        docs/core-functionality/devices.md
        docs/core-functionality/ipam.md
        docs/core-functionality/modules.md
        docs/core-functionality/power.md
        docs/core-functionality/services.md
        docs/core-functionality/sites-and-racks.md
        docs/core-functionality/tenancy.md
        docs/core-functionality/virtualization.md
        docs/core-functionality/vlans.md
        docs/core-functionality/wireless.md
        docs/customization/custom-fields.md
        docs/customization/custom-scripts.md
        docs/customization/custom-validation.md
        docs/customization/export-templates.md
        docs/customization/reports.md
        docs/development/adding-models.md
        docs/development/application-registry.md
        docs/development/extending-models.md
        docs/development/getting-started.md
        docs/development/index.md
        docs/development/models.md
        docs/development/release-checklist.md
        docs/development/style-guide.md
        docs/graphql-api/overview.md
        docs/index.md
        docs/installation/1-postgresql.md
        docs/installation/2-redis.md
        docs/installation/3-netbox.md
        docs/installation/4-gunicorn.md
        docs/installation/5-http-server.md
        docs/installation/6-ldap.md
        docs/installation/index.md
        docs/installation/migrating-to-systemd.md
        docs/installation/upgrading.md
        docs/media/screenshots/home-dark.png
        docs/media/screenshots/home-light.png
        docs/models/circuits/circuit.md
        docs/models/circuits/circuittermination.md
        docs/models/circuits/circuittype.md
        docs/models/circuits/provider.md
        docs/models/circuits/providernetwork.md
        docs/models/dcim/cable.md
        docs/models/dcim/consoleport.md
        docs/models/dcim/consoleporttemplate.md
        docs/models/dcim/consoleserverport.md
        docs/models/dcim/consoleserverporttemplate.md
        docs/models/dcim/device.md
        docs/models/dcim/devicebay.md
        docs/models/dcim/devicebaytemplate.md
        docs/models/dcim/devicerole.md
        docs/models/dcim/devicetype.md
        docs/models/dcim/frontport.md
        docs/models/dcim/frontporttemplate.md
        docs/models/dcim/interface.md
        docs/models/dcim/interfacetemplate.md
        docs/models/dcim/inventoryitem.md
        docs/models/dcim/inventoryitemrole.md
        docs/models/dcim/inventoryitemtemplate.md
        docs/models/dcim/location.md
        docs/models/dcim/manufacturer.md
        docs/models/dcim/module.md
        docs/models/dcim/modulebay.md
        docs/models/dcim/modulebaytemplate.md
        docs/models/dcim/moduletype.md
        docs/models/dcim/platform.md
        docs/models/dcim/powerfeed.md
        docs/models/dcim/poweroutlet.md
        docs/models/dcim/poweroutlettemplate.md
        docs/models/dcim/powerpanel.md
        docs/models/dcim/powerport.md
        docs/models/dcim/powerporttemplate.md
        docs/models/dcim/rack.md
        docs/models/dcim/rackreservation.md
        docs/models/dcim/rackrole.md
        docs/models/dcim/rearport.md
        docs/models/dcim/rearporttemplate.md
        docs/models/dcim/region.md
        docs/models/dcim/site.md
        docs/models/dcim/sitegroup.md
        docs/models/dcim/virtualchassis.md
        docs/models/extras/configcontext.md
        docs/models/extras/customfield.md
        docs/models/extras/customlink.md
        docs/models/extras/exporttemplate.md
        docs/models/extras/imageattachment.md
        docs/models/extras/tag.md
        docs/
Aborting

[candlerb]

Looks like you've done something weird. "git diff" may tell you what's borked, but it looks like everything is borked. Is it possible you untarred/unzipped a release tarball on top of your git checkout?

I would blow it away and start again. That's not as bad as it sounds: you won't lose any data (unless you did something bad with your database as well).

mv /opt/netbox /opt/netbox-broken

Then start again with a fresh git checkout, following the normal install instructions. Copy your configuration.py and any custom scripts/reports from the old location into the new. Remember the ./upgrade.sh step.

[woohung]

It looks like I broke something when I did the migration while installing the plugin.
I have a snapshot, before installing the plugin, I rolled back to it and successfully updated the netbox. Next time I will check that fact.
I also had deprecated fields that I forgot about. I'm started upgrade.sh like this: sudo PYTHON=/usr/bin/python3 NETBOX_DELETE_LEGACY_DATA=1 ./upgrade.sh and all was successful. Before and after upgrade, git diff is empty.
Thanks for the quick response!