I'm getting this same thing.? Here is the SSH capture:
pi@sbitx:~ $ cd sbitx
pi@sbitx:~/sbitx $ ./update
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Thu 08 Jun 2023 07:02:29 PM IST
Updating 0060f3d..2235d5c
error: Your local changes to the following files would be overwritten by merge:
? ? ? ? data/hw_settings.ini
Please commit your changes or stash them before you merge.
Aborting
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Thu 08 Jun 2023 07:02:29 PM IST
database is intact
compiling sbitx version v2.0 in /home/pi/sbitx
<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
pi@sbitx:~/sbitx $ error: Your local changes to the following files would be overwritten by merge:
-bash: error:: command not found
pi@sbitx:~/sbitx $? ? ? ? ?data/hw_settings.inierror: Your local changes to the following files would be overwritten by merge:
-bash: data/hw_settings.inierror:: No such file or directory
pi@sbitx:~/sbitx $? ? ? ? ?data/hw_settings.ini
Any advice?
Also, is there a command to check current version we're at, or is it displayed somewhere that I haven't found yet?
Thanks!
--Neil, W2NDG? sBITX # 001
?
Neil Goldstein