• Recent
  • Unsolved
  • Tags
  • Popular
  • Users
  • Groups
  • Search
  • Register
  • Login
  • Recent
  • Unsolved
  • Tags
  • Popular
  • Users
  • Groups
  • Search
  • Register
  • Login

RC11 : Update to latest error

Scheduled Pinned Locked Moved Solved
FOG Problems
2
3
885
Loading More Posts
  • Oldest to Newest
  • Newest to Oldest
  • Most Votes
Reply
  • Reply as topic
Log in to reply
This topic has been deleted. Only users with topic management privileges can see it.
  • S
    Seydoo
    last edited by Seydoo Oct 1, 2016, 3:08 AM Oct 1, 2016, 8:03 AM

    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 ?

    1 Reply Last reply Reply Quote 0
    • W
      Wayne Workman
      last edited by Wayne Workman Oct 1, 2016, 12:16 PM Oct 1, 2016, 6:15 PM

      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.

      Please help us build the FOG community with everyone involved. It's not just about coding - way more we need people to test things, update documentation and most importantly work on uniting the community of people enjoying and working on FOG!
      Daily Clean Installation Results:
      https://fogtesting.fogproject.us/
      FOG Reporting:
      https://fog-external-reporting-results.fogproject.us/

      1 Reply Last reply Reply Quote 0
      • S
        Seydoo
        last edited by Oct 5, 2016, 9:31 AM

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

        You can close this topic

        1 Reply Last reply Reply Quote 0
        • 1 / 1
        1 / 1
        • First post
          3/3
          Last post

        154

        Online

        12.0k

        Users

        17.3k

        Topics

        155.2k

        Posts
        Copyright © 2012-2024 FOG Project