root@hostname:/opt/netbox# git pull origin master
* branch master -> FETCH_HEAD
Updating fa7b728..f945216
error: Your local changes to the following files would be overwritten by merge:
.github/ISSUE_TEMPLATE.md
.gitignore
.travis.yml
README.md
docs/api/examples.md
docs/api/overview.md
docs/configuration/optional-settings.md
docs/data-model/ipam.md
docs/index.md
docs/installation/ldap.md
docs/installation/netbox.md
docs/installation/postgresql.md
docs/installation/web-server.md
docs/shell/intro.md
mkdocs.yml
netbox/circuits/api/serializers.py
netbox/circuits/api/urls.py
netbox/circuits/api/views.py
netbox/circuits/filters.py
netbox/circuits/forms.py
netbox/circuits/models.py
netbox/circuits/tables.py
netbox/circuits/urls.py
netbox/circuits/views.py
netbox/dcim/api/serializers.py
netbox/dcim/api/urls.py
netbox/dcim/api/views.py
netbox/dcim/constants.py
netbox/dcim/filters.py
netbox/dcim/forms.py
netbox/dcim/models.py
netbox/dcim/tables.py
netbox/dcim/tests/test_models.py
netbox/dcim/urls.py
netbox/dcim/views.py
netbox/extras/admin.py
netbox/extras/api/customfields.py
netbox/extras/api/serializers.py
netbox/extras/api/urls.py
netbox/extras/api/views.py
netbox/extras/constants.py
netbox/extras/filters.py
netbox/extras/management/commands/nbshell.py
netbox/extras/models.py
netbox/extras/rpc.py
netbox/extras/urls.py
netbox/extras/views.py
netbox/ipam/api/serializers.py
netbox/ipam/api/urls.py
netbox/ipam/api/views.py
netbox/ipam/constants.py
netbox/ipam/filters.py
netbox/ipam/fixtures/ipam.json
netbox/ipam/forms.py
netbox/ipam/lookups.py
netbox/ipam/models.py
netbox/ipam/tables.py
netbox/ipam/urls.py
netbox/ipam/views.py
netbox/netbox/forms.py
netbox/netbox/settings.py
netbox/netbox/urls.py
netbox/netbox/views.py
netbox/project-static/css/base.css
netbox/project-static/js/forms.js
netbox/project-static/js/secrets.js
netbox/secrets/api/serializers.py
netbox/secrets/api/urls.py
netbox/secrets/api/views.py
netbox/secrets/forms.py
netbox/secrets/models.py
netbox/secrets/urls.py
netbox/secrets/views.py
netbox/templates/500.html
netbox/templates/_base.html
netbox/templates/circuits/circuit.html
netbox/templates/circuits/circuit_edit.html
netbox/templates/circuits/circuittermination_edit.html
netbox/templates/circuits/inc/circuit_termination.html
netbox/templates/dcim/device.html
netbox/templates/dcim/device_bulk_add_component.html
netbox/templates/dcim/device_lldp_neighbors.html
netbox/templates/dcim/device_status.html
netbox/templates/dcim/devicetype.html
netbox/templates/dcim/devicetype_list.html
netbox/templates/dcim/inc/consoleserverport.html
netbox/templates/dcim/inc/interface.html
netbox/templates/dcim/inc/rack_elevation.html
netbox/templates/dcim/inc/service.html
netbox/templates/dcim/manufacturer_list.html
netbox/templates/dcim/rack.html
netbox/templates/dcim/rack_edit.html
netbox/templates/dcim/rack_list.html
netbox/templates/dcim/rackgroup_list.html
netbox/templates/dcim/rackreservation_list.html
netbox/templates/dcim/region_list.html
netbox/templates/home.html
netbox/templates/inc/table.html
netbox/templates/ipam/aggregate_list.html
netbox/templates/ipam/inc/prefix_header.html
netbox/templates/ipam/ipaddress.html
netbox/templates/ipam/ipaddress_assign.html
netbox/templates/ipam/ipaddress_bulk_add.html
netbox/templates/ipam/ipaddress_edit.html
netbox/templates/ipam/ipaddress_unassign.html
netbox/templates/ipam/role_list.html
netbox/templates/ipam/service_edit.html
netbox/templates/login.html
netbox/templates/secrets/secret_import.html
netbox/templates/tenancy/tenant.html
netbox/templates/utilities/confirmation_form.html
netbox/templates/utilities/obj_bulk_delete.html
netbox/templates/utilities/obj_bulk_edit.html
netbox/templates/utilities/obj_edit.html
netbox/templates/utilities/obj_import.html
netbox/tenancy/api/serializers.py
netbox/tenancy/api/urls.py
netbox/tenancy/api/views.py
netbox/tenancy/filters.py
netbox/tenancy/forms.py
netbox/tenancy/urls.py
netbox/tenancy/views.py
netbox/utilities/api.py
netbox/utilities/filters.py
netbox/utilities/forms.py
netbox/utilities/tables.py
netbox/utilities/templatetags/helpers.py
netbox/utilities/views.py
requirements.txt
Please commit your changes or stash them before you merge.
Aborting