OPNsense Forum

English Forums => Development and Code Review => Topic started by: opnsenseuser on October 07, 2018, 08:44:06 pm

Title: Updating 8d08b67d2..b9ba4f60e -> error: Your local changes to the following file
Post by: opnsenseuser on October 07, 2018, 08:44:06 pm

Code: [Select]

root@OPNsense:~ # opnsense-code core
Fetching origin
Updating 8d08b67d2..b9ba4f60e
error: Your local changes to the following files would be overwritten by merge:
        plist
Please commit your changes or stash them before you merge.
Aborting
what i already did:

1. delete core and plugins folder from my local storage and my github repos (core and plugins)
2. refork to my git and clone to my harddisk again!

but i get the same error!

what can i do ?
thx
regards rené

Title: Re: Updating 8d08b67d2..b9ba4f60e -> error: Your local changes to the following file
Post by: opnsenseuser on October 08, 2018, 12:06:40 am

I had a copy of my vm. All looks great now. Thx

Title: Re: Updating 8d08b67d2..b9ba4f60e -> error: Your local changes to the following file
Post by: franco on October 17, 2018, 10:26:12 pm

For future reference: Your local git had modifications. We don't clear them so no work is lost. If you need to update anyway just clear your local changes:

# cd /usr/core && git checkout -f


Cheers,
Franco