Plugin build configuration.py and netbox.env conflict

[etfz]

Hi,

I managed to get a plugin build going a while back. I find the whole process very involved, and now when I'm trying to update NetBox Docker, configuration/configuration.py and env/netbox.env, which I edited as part of the plugin setup, are in conflict when I try to pull the Git changes. Makes sense, but is there no better procedure than manually putting my changes aside before pulling, and then restoring them?