¿ªÔÆÌåÓý

  1. BITX20
  2. Topics

Sbitx v2 update error

 

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
 

It shouldn't complain about hw_settings.ini.
- f

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

 

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
?
 

¿ªÔÆÌåÓý

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

<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<?

?

?

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.

- f

?

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


Virus-free.
 

Does anyone know the answer to this?? I'm being careful with the radio until I know if my updates area actually working.

Thanks!

--Neil
 

¿ªÔÆÌåÓý

Neil

?

After some research, I finally got ./update to run without any errors. Apparently my version was out of sync with the version on github. I opened up a terminal window and typed in git stash which moved the files out of sync to a separate location. I then ran ./update and a list (index) of changes appeared on screen. The ./ update command finished and then I ran ./build sbitx. My Sbitx v2 is in sync with the version on github. I am not a programmer or even a novice a software, perhaps someone here can clarify what I did. All I know is that it has all the latest updates.

?

art

?

From: [email protected] <[email protected]> On Behalf Of Neil Goldstein
Sent: Friday, June 9, 2023 8:11 AM
To: [email protected]
Subject: Re: [BITX20] Sbitx v2 update error

?

Does anyone know the answer to this?? I'm being careful with the radio until I know if my updates area actually working.

Thanks!

--Neil


Virus-free.

1 - 6 of 6