RC11 : Update to latest error



  • Server
    • FOG Version: 1.3 RC10
    • OS: RedHat
    Client
    • Service Version: v0.11.5
    • OS: W10
    Description

    Hi everyone,

    I have a little problem to update to RC11.
    I wanted to use the option “uptade to latest” with a git pull but something blok me :

    [root@mfvml14 fogproject]# git pull
    Updating bad33be…2718a13
    error: Your local changes to ‘lib/redhat/config.sh’ would be overwritten by merge. Aborting.
    Please, commit your changes or stash them before you can merge.

    [root@mfvml14 fogproject]# git log -1
    commit bad33be289a64419607b666b066f2e9887344c43
    Author: Tom Elliott tommygunsster@gmail.com
    Date: Fri Sep 9 08:46:42 2016 -0400

    need to allow requestclientinfo.
    

    can someone help me ?



  • Thx Wayne, your method worked I’m now in RC11

    You can close this topic


  • Moderator

    Just delete the entire fogproject directory and re-clone, thats the simplest way to fix it. I don’t think you’re worried about stashing changes and such.

    So, to remove a directory recursively, it’s rm -rf fogproject
    When you run that, don’t be in the fogproject directory, be one up from it. So if you ran the ls command, you would see fogproject as one of the items in your CWD.

    After deleting, just re-clone quickly with:
    git clone --depth 1 https://github.com/FOGProject/fogproject.git

    That won’t pull everything, it’ll just pull the very latest version of the dev-branch, which is what you want. Then from here, you’d go into the new fogproject directory, and then into the bin directory as usual and run the installer as usual. You’d update as normal in the future.


Log in to reply
 

Looks like your connection to FOG Project was lost, please wait while we try to reconnect.