Issue with console after Java Update

Command Line
1

Need help, just updated the server hardware to version 8, i tried to check for updates to the webUI and i get this message:

root@core ~# cd /usr/games/minecraft
root@core games/minecraft# git fetch
root@core games/minecraft# git merge origin/master
error: Your local changes to the following files would be overwritten by merge:
server.js
Please, commit your changes or stash them before you can merge.
Aborting
root@core games/minecraft#

I have no clue what this is, any help is appreciated.

Also i keep getting this message:

root@core ~# cd /usr/games/minecaft
-bash: cd: /usr/games/minecaft: No such file or directory
root@core ~# cd /usr/games/minecraft
root@core games/minecraft# git fetch
remote: Counting objects: 3, done.
remote: Compressing objects: 100% (1/1), done.
remote: Total 3 (delta 2), reused 3 (delta 2), pack-reused 0
Unpacking objects: 100% (3/3), done.
From https://github.com/hexparrot/mineos-node
e5bc12b…93ab5e1 master -> origin/master
root@core games/minecraft# git merge origin/master
fatal: You have not concluded your merge (MERGE_HEAD exists).
Please, commit your changes before you can merge.
root@core games/minecraft#

2

Hi
That message means that one or more files in your MineOS installation is different from any version online. This almost always only happen if you change something in any of the files of your MineOS instalation.

(I for example have to change mineos.js in one place to allow archiving to a windows harrdrive, this means each time I try to update the “normal” way I get that error message)

Solution:

Use
git reset --hard origin/master

instead of
git merge origin/master

This resets and overwrites any files your MineOS installation and Git feel are a locally changed file.

(that can be considered a warning as well: If you have done any local adjustments to your MineOS installation these are lost when you do this.)

2 Likes
3

That’s what i ended up doing, nothing was changed , only thing i did was update Java. All seem to be working ok now.