Problem with updating Codebase

Hi

I am having problems with updating to latest codebase the following shows when i run a ./daily.sh

[email protected]:~$ ./daily.sh
Updating to latest codebase FAIL
error: Your local changes to the following files would be overwritten by merge:
html/css/styles.css
Please commit your changes or stash them before you merge.
Aborting
Updating Composer packages OK
Updating SQL-Schema OK
Updating submodules OK
Cleaning up DB OK
Fetching notifications OK
Caching PeeringDB data OK
Caching Mac OUI data OK

please help

thanks

Did you make any changes to the file html/css/styles.css ?

@TheGracens yes i have done changes to the style.css file, i have changed the background colour made it blue instead of white

It tells you exactly what’s wrong? Restore the file and it will work again

@Jellyfrog i dont know how to stash them, as i am new ubuntu, i want retain my changes and be able update the codebase

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