Re: Sbitx v2 update error
|
Farhan ? Ok but it does. ? The build command compiles. The update command complains. Is there anther command to commit ? art ? pi@sbitx:~/sbitx $ ./build sbitx >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>? Thu 08 Jun 2023 09:36:15 AM EDT database is intact compiling sbitx version v2.0 in /home/pi/sbitx <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<? ? ?
toggle quoted message
Show quoted text
From: [email protected] < [email protected]> On Behalf Of Ashhar Farhan Sent: Thursday, June 8, 2023 9:31 AM To: [email protected]Subject: Re: [BITX20] Sbitx v2 update error ? It shouldn't complain about hw_settings.ini. ? On Thu, Jun 8, 2023, 6:54 PM Art N2AJO <olson339@...> wrote: tried to update mu sbitx v2 this morning and this the error I get using putty. Not sure what is meant by commit your changes. These are the commands I used
cd sbitx
./update
./build sbitx
Thu 08 Jun 2023 09:19:27 AM EDT
Updating bf605d1..2235d5c
error: Your local changes to the following files would be overwritten by merge:
??????? data/hw_settings.ini
??????? sbitx
Please commit your changes or stash them before you merge.
Aborting
|
