Hi Rubash,
It had to do with Git. Although I followed instructions here: Update Error: Changes made? - #11 by Francois_Ifitwala
it wasn’t enough. I still had issues.
Using
git reset–mixed
solved my update problems. Now I am not sure what are the consequences of doing that.