Post
Topic
Board Hardware
Re: [ANN] US/North American Bitfury sales NEW STOCK ***NOW SHIPPING***
by
allinvain
on 22/01/2014, 06:42:12 UTC
however, when i try to update bfgminer with:

Code:
cd bfgminer && git pull && make && sudo make install && sudo shutdown -r now

i get this:

Code:
error: Your local changes to the following files would be overwritten by merge:
driver-bfsb.c
Please, commit your changes or stash them before you can merge.
Aborting

how can i fix this error?

I had that problem back when I tried to update cgminer in minepeon. Kano used this as a solution back then:

git checkout etc/miner.conf.donate
git pull


So I am guessing (might be wrong) your solution might be something like this:

Code:
cd bfgminer && git checkout driver-bfsb.c && git pull && make && sudo make install && sudo shutdown -r now

worked great Morblias, thank you.

my stratum connection is rock solid now and i'm continuing to tweek chip settings.

Can you actually tune individual chips with MFG?

There is but it's not as userfriendly as editing the best.cnf or .stats.log as with chainminer.