Well, that might be easier said than done. I tried doing a git pull this afternoon and it aborted because it said I had changes that I needed to commit first. As I have not changed users.c or any of the other source code it had listed, I find this difficult to believe. As I don't want to lose the code (in case I need to fall back due to this issue) I am leery to remove the offending members.
That is odd.
unless when you restored your files last time you didn't restore the .git directory along with it. It may think it's still running a recent version
that has been modified back to an old version (if that makes sense?)
My suggestion is to make a backup of everything, the entire MagickaBBS directory, so you can delete the offending files and update cleanly, then
if it doesn't work just delete your MagickaBBS directory and copy the old
one back over.
Of course, if the version you are using is working for you and you are
happy with it the way it is, don't worry about it :)
Andrew
--- MagickaBBS v0.13alpha (Linux/x86_64)
* Origin: HappyLand (21:1/126)