Yesterday I did to my 3 RPI's, a
sudo -i,
cd /opt/minepeon/,
git fetch --all followed by
git reset --hard origin/master in minepeon folder, as I do more or less every day.
After that, I always get the following error, trying to
git pull minepeon and after the reboot of one of the RPI's, it reverted from version 0.2.4.2 to version 0.2.4 pr2 and bfgminer 3.3.0.
minepeon /opt/minepeon # git pull
remote: Counting objects: 128, done.
remote: Compressing objects: 100% (19/19), done.
remote: Total 39 (delta 19), reused 36 (delta 16)
Unpacking objects: 100% (39/39), done.
From
https://github.com/MineForeman/minepeon-base d7d3fc1..374537a master -> origin/master
*** Please tell me who you are.
Run
git config --global user.email "
you@example.com"
git config --global user.name "Your Name"
to set your account's default identity.
Omit --global to set the identity only in this repository.
fatal: unable to auto-detect email address (got 'root@minepeon.(none)')
I did the git config's with email and name and after that, I got:
minepeon /opt/minepeon
# git config --global user.email "
bitcoin.PT@gmail.com"
minepeon /opt/minepeon # git config --global user.name "Rui Costa"
minepeon /opt/minepeon # git pull
error: Your local changes to the following files would be overwritten by merge:
bin/bfgminer
Please, commit your changes or stash them before you can merge.
Aborting
MinePeon Version
MinePeon 0.2.4 pr2
Miner Version
bfgminer3.3.0
Donation Minutes
15
What did I do wrong this time? How can I correct this?
UPDATE: I did again a
git fetch --all followed by
git reset --hard origin/master and I got:
minepeon /opt/minepeon
# git fetch --all
Fetching origin
minepeon /opt/minepeon # git reset --hard origin/master
HEAD is now at 374537a Start of pool switching
minepeon /opt/minepeon # git pull
warning: Cannot merge binary files: lib/libhidapi-libusb.so.0.0.0 (HEAD vs. 82c4f503ec19f6862550c3df5b2706bd48cf8ff2)
warning: Cannot merge binary files: lib/libhidapi-libusb.a (HEAD vs. 82c4f503ec19f6862550c3df5b2706bd48cf8ff2)
warning: Cannot merge binary files: lib/libhidapi-hidraw.so.0.0.0 (HEAD vs. 82c4f503ec19f6862550c3df5b2706bd48cf8ff2)
warning: Cannot merge binary files: lib/libhidapi-hidraw.a (HEAD vs. 82c4f503ec19f6862550c3df5b2706bd48cf8ff2)
warning: Cannot merge binary files: bin/bfgminer (HEAD vs. 82c4f503ec19f6862550c3df5b2706bd48cf8ff2)
Auto-merging share/doc/bfgminer/NEWS
CONFLICT (content): Merge conflict in share/doc/bfgminer/NEWS
Auto-merging lib/libhidapi-libusb.so.0.0.0
CONFLICT (add/add): Merge conflict in lib/libhidapi-libusb.so.0.0.0
Auto-merging lib/libhidapi-libusb.a
CONFLICT (add/add): Merge conflict in lib/libhidapi-libusb.a
Auto-merging lib/libhidapi-hidraw.so.0.0.0
CONFLICT (add/add): Merge conflict in lib/libhidapi-hidraw.so.0.0.0
Auto-merging lib/libhidapi-hidraw.a
CONFLICT (add/add): Merge conflict in lib/libhidapi-hidraw.a
Auto-merging http/index.php
Auto-merging http/inc/miner.inc.php
Auto-merging bin/bfgminer
CONFLICT (content): Merge conflict in bin/bfgminer
Automatic merge failed; fix conflicts and then commit the result.
minepeon /opt/minepeon
#
MinePeon Version
MinePeon 0.2.4.2
Miner Version
bfgminer3.8.1
Donation Minutes
15
I could correct minepeon version, with the new option to modify the position of a pool and new 'plugins' option.
The problem now is the version of bfgminer as, when the version of bfgminer reverted to 3.3.0, my bluefury's didn't get detected any more and I download/compiled version 3.8.1 of bfgminer, that is newer than the one @ minepeon git.
if I try a git commit, I get:
minepeon /opt/minepeon/http # git commit
U bin/bfgminer
U lib/libhidapi-hidraw.a
U lib/libhidapi-hidraw.so.0.0.0
U lib/libhidapi-libusb.a
U lib/libhidapi-libusb.so.0.0.0
U share/doc/bfgminer/NEWS
error: 'commit' is not possible because you have unmerged files.
hint: Fix them up in the work tree,
hint: and then use 'git add/rm <file>' as
hint: appropriate to mark resolution and make a commit,
hint: or use 'git commit -a'.
fatal: Exiting because of an unresolved conflict.
After a google search, I did a git commit -am and got:
minepeon /opt/minepeon/http
# git commit -am "bfgminer update to 3.8.1"
[0.2.4 c9b21c8] bfgminer update to 3.8.1
Did I solved correctly the problem? I think I need to stop to do the
git fetch --all followed by
git reset --hard origin/master or am I wrong?
