Unable to Upgrade

[benek984]

Trying to upgrade but getting below error. Netbox installed via git pull options.

[root@ussd-prd-nbox01 netbox]# pwd
/opt/netbox
[root@ussd-prd-nbox01 netbox]# git checkout master
M       netbox/netbox/settings.py
M       requirements.txt
Already on 'master'
Your branch is behind 'origin/master' by 85 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)
[root@ussd-prd-nbox01 netbox]# git pull origin master
From https://github.com/netbox-community/netbox
 * branch            master     -> FETCH_HEAD
Updating 6b6ea36..3c91331
error: Your local changes to the following files would be overwritten by merge:
        netbox/netbox/settings.py
        requirements.txt
Please commit your changes or stash them before you merge.
Aborting

[kkthxbye-code]

You are not supposed to edit those two files, they are part of core netbox. You can revert the files to their default state and the pull should work.

[jeremystretch]

To add to this:

• Configuration changes should be made in configuration.py
• Any local requirements should be added to a new file name local_requirements.txt in the project root

[candlerb]

And to revert those files to pristine:

cp netbox/netbox/settings.py netbox/netbox/settings.py.borked
git checkout netbox/netbox/settings.py

cp requirements.txt requirements.txt.borked
git checkout requirements.txt

After that, your "git pull" should work.