error: Your local changes to the following files would be overwritten by merge:
        nrao/VLA/CalModels/3C138_K.im/table.dat
        nrao/VLA/CalModels/3C138_K.im/table.lock
Please commit your changes or stash them before you merge.
Aborting
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed

  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
100 9419k  100 9419k    0     0  74.7M      0 --:--:-- --:--:-- --:--:-- 75.3M
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed

  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
100   201  100   201    0     0   7543      0 --:--:-- --:--:-- --:--:--  7444
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed

  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
100   511  100   511    0     0  19442      0 --:--:-- --:--:-- --:--:-- 19653
Switched to a new branch 'CAS-14721'
Updated 2 paths from 2ea1f39c47
Updated 1 path from f84d49e178
Switched to a new branch 'CAS-14721'
lock file is not empty : /Users/casaci/bamboohome/xml-data/build-dir/CASASPECS-DEVTESTPY31269-TTARM15PY312/casa6/casatestutils/nosedir/test_casaconfig/testrundata/data_update.lock
The lock file at /Users/casaci/bamboohome/xml-data/build-dir/CASASPECS-DEVTESTPY31269-TTARM15PY312/casa6/casatestutils/nosedir/test_casaconfig/testrundata is not empty.
A previous attempt to update path may have failed or exited prematurely.
Remove the lock file and set force to True with the desired version (default to most recent).
It may be best to completely repopulate path using pull_data and measures_update.
lock file is not empty : /Users/casaci/bamboohome/xml-data/build-dir/CASASPECS-DEVTESTPY31269-TTARM15PY312/casa6/casatestutils/nosedir/test_casaconfig/testrundata/data_update.lock
data_update: the lock file at /Users/casaci/bamboohome/xml-data/build-dir/CASASPECS-DEVTESTPY31269-TTARM15PY312/casa6/casatestutils/nosedir/test_casaconfig/testrundata is not empty.
A previous attempt to update path may have failed or exited prematurely.
Remove the lock file and set force to True with the desired version (default to most recent).
It may be best to completely re-populate path using pull_data and measures_update.
measures_update can't find specified version WSRT_Measures_20260303-160001.ztar at site https://go.nrao.edu/iers/
measures_update can't find specified version NRAO_Measures_20260302-140940.ztar at site https://www.astron.nl/iers/
Unable to retrieve list of available measures versions, measures_site value may be an empty list or no files were found at measures_site, check and try again.
There was a remote error while attempting to update measures at /Users/casaci/bamboohome/xml-data/build-dir/CASASPECS-DEVTESTPY31269-TTARM15PY312/casa6/casatestutils/nosedir/test_casaconfig/testmeasures
Check the value of measures_site and try again
a nosedir
a nosedir/xml
a nosedir/test_casaconfig
a nosedir/test_casaconfig/test_casaconfig.py
a nosedir/test_casaconfig/conftest.py
a nosedir/test_casaconfig/casa-20260306-153839.log
a nosedir/test_casaconfig/casa-20260306-153916.log
a nosedir/test_casaconfig/short_summary.log
a nosedir/test_casaconfig/casa-20260306-153820.log
a nosedir/test_casaconfig/casa-20260306-154232.log
a nosedir/test_casaconfig/casa-20260306-153819.log
a nosedir/xml/test_casaconfig
a nosedir/xml/test_casaconfig/nose.xml