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