On update, error with local repository

Jacob

Wonderful, how have showed me how to do the update properly.

showed that everything was up to date. However,

showed all kinds of modified issues, as follows:

pi@atlantis:/etc/.pihole $ cd /var/www/html/admin;git status
On branch master
Your branch is behind 'origin/master' by 2348 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
Changes not staged for commit:
(use "git add ..." to update what will be committed)
(use "git checkout -- ..." to discard changes in working directory)

modified:   .github/ISSUE_TEMPLATE.md
modified:   .github/PULL_REQUEST_TEMPLATE.md
modified:   .gitignore
modified:   .pullapprove.yml
modified:   .user.php.ini
modified:   CONTRIBUTING.md
modified:   LICENSE
……

I followed the suggestions in the following website to address these modifications prior to the update:

I also saved the lighttpd.conf file as suggested on the DietPi forum website:

And once I did so the update worked great.

Thanks for the help.