Checking out of branch fails with modified files

Help
1

I can't change to FTLDNS branch due to error installing. core is installing correctly but when I try to checkout web I get this result:

# sudo pihole checkout web FTLDNS

Please note that changing branches severely alters your Pi-hole subsystems
Features that work on the master branch, may not on a development branch
This feature is NOT supported unless a Pi-hole developer explicitly asks!
Have you read and understood this? [y/N] y

[✓] Fetching branches from https://github.com/pi-hole/AdminLTE.git
[i] 17 branches available for Web Admin

[i] Switching to branch: 'FTLDNS' from 'refs/heads/master'error: Your local changes to the following files would be overwritten by checkout:
api_FTL.php
queries.php
scripts/pi-hole/js/queries.js
scripts/pi-hole/php/FTL.php
Please commit your changes or stash them before you switch branches.
Aborting

Any help?

Thanks in advance
Best Regards,

2

You have modified these files yourself. Do as it suggests:

by doing:

cd /var/www/html/admin
git stash

and try again

1 Like
3

I didn't modify any files. I'm using dietpi, and installed pihole using dietpi-software installation program. May be it patches these files... I don't know.
I ran:
pihole -r
Then ran the commands for installing FTLDNS and yet it didn't display any error but web service was not FTLNDS.
Finally I ran again:
pihole -r
and now all seems ok:
Pi-hole Version vDev (FTLDNS, v3.2.1-139-gff47ab1) Web Interface Version vDev (FTLDNS, v3.2.1-80-g517fa24f) FTL Version vDev (FTLDNS, vDev-c5f34a4)

Thanks for your fast support.
Best Regards,

4

This topic was automatically closed 21 days after the last reply. New replies are no longer allowed.