OPNsense Forum

Archive => 18.7 Legacy Series => Topic started by: cguilford on July 06, 2018, 07:33:56 pm

Title: error while making upgrade?
Post by: cguilford on July 06, 2018, 07:33:56 pm

When I run opnsense-code core I'm getting the following:

Fetching Origin
updating 68f53ef00..c2e75d260
error: Your local changes to the following files would be overwritten by merge:
Makefile
please commit your changes or stash before you merge.
aborting.

Title: Re: error while making upgrade?
Post by: cguilford on July 06, 2018, 07:37:41 pm

Never Mind I just renamed the Makefile and let it recreate it seems all better now.

Title: Re: error while making upgrade?
Post by: franco on July 06, 2018, 11:16:38 pm

opnsense-code will only do a "git pull" so if there are changes in the way git won't comply, or you apply more force and use...

# opnsense-code -f core

... in which case the directory is deleted and the repository is recreated from scratch.


Cheers,
Franco