Error when upgrading to the latest Trunk
When I perform the git pull to obtain the latest Trunk, I get an error that changes need to be committed and then the git aborts. Here is the full transcript from the git pull. I have not manually made any changes to the referenced file.
root@srv01309:/opt/fogproject# git pull remote: Counting objects: 289, done. remote: Compressing objects: 100% (68/68), done. remote: Total 289 (delta 177), reused 147 (delta 147), pack-reused 69 Receiving objects: 100% (289/289), 2.37 MiB | 3.87 MiB/s, done. Resolving deltas: 100% (182/182), completed with 50 local objects. From https://github.com/fogproject/fogproject 456baa8..b84bae1 dev-branch -> origin/dev-branch 8f1e322..305260c svn -> origin/svn Updating b8eb6fb..b84bae1 error: Your local changes to the following files would be overwritten by merge: rpttmp/Hosts and Users.php Please, commit your changes or stash them before you can merge. Aborting
@glienhard Another option would be, when you see that error, to run:
git reset --hard
Great, thanks. I wanted to post the question just incase there was something else in the code that needed to be know.
It is all working as advertised now
just delete that directory and re-clone the repo. Here are steps for your specific directory location:
cd /opt rm -rf fogproject git clone --depth 1 https://github.com/FOGProject/fogproject.git cd fogproject/bin ./installfog.sh -y