OPNsense
  • Home
  • Help
  • Search
  • Login
  • Register

  • OPNsense Forum »
  • English Forums »
  • Development and Code Review (Moderator: fabian) »
  • Updating 8d08b67d2..b9ba4f60e -> error: Your local changes to the following file
« previous next »
  • Print
Pages: [1]

Author Topic: Updating 8d08b67d2..b9ba4f60e -> error: Your local changes to the following file  (Read 277 times)

opnsenseuser

  • Full Member
  • ***
  • Posts: 199
  • Karma: 9
    • View Profile
Updating 8d08b67d2..b9ba4f60e -> error: Your local changes to the following file
« 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é

« Last Edit: October 07, 2018, 08:52:01 pm by noname12123 »
Logged
Supermicro X11SBA-LN4F, Supermicro A2SDi-4C-HLN4F
Team Rebellion Member (collapsible sidebar/tukan/cicada)

opnsenseuser

  • Full Member
  • ***
  • Posts: 199
  • Karma: 9
    • View Profile
Re: Updating 8d08b67d2..b9ba4f60e -> error: Your local changes to the following file
« Reply #1 on: October 08, 2018, 12:06:40 am »
I had a copy of my vm. All looks great now. Thx
Logged
Supermicro X11SBA-LN4F, Supermicro A2SDi-4C-HLN4F
Team Rebellion Member (collapsible sidebar/tukan/cicada)

franco

  • Administrator
  • Hero Member
  • *****
  • Posts: 8069
  • Karma: 531
    • View Profile
Re: Updating 8d08b67d2..b9ba4f60e -> error: Your local changes to the following file
« Reply #2 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
Logged

  • Print
Pages: [1]
« previous next »
  • OPNsense Forum »
  • English Forums »
  • Development and Code Review (Moderator: fabian) »
  • Updating 8d08b67d2..b9ba4f60e -> error: Your local changes to the following file
 

OPNsense is an OSS project © Deciso B.V. 2015 - 2019 All rights reserved
  • SMF 2.0.15 | SMF © 2017, Simple Machines
    Privacy Policy
    | XHTML | RSS | WAP2