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
40 9419k   40 3804k    0     0  46.8M      0 --:--:-- --:--:-- --:--:-- 46.4M
100 9419k  100 9419k    0     0  71.8M      0 --:--:-- --:--:-- --:--:-- 71.8M
  % 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   201  100   201    0     0   2441      0 --:--:-- --:--:-- --:--:--  2451
  % 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   9687      0 --:--:-- --:--:-- --:--:--  9826
Switched to a new branch 'CAS-14542'
Updated 2 paths from e787b5e777
Updated 1 path from c57f9800c4
  % 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   669    0   669    0     0  39679      0 --:--:-- --:--:-- --:--:-- 41812
2025-11-24 18:55:08        SEVERE        msmetadata_cmpt.cc::baseband        Exception Reported: This MS's SPECTRAL_WINDOW table does not have a BBC_NO column
sh: convert: command not found
2025-11-24 18:55:10        SEVERE        msmetadata_cmpt.cc::baseband        Exception Reported: This MS's SPECTRAL_WINDOW table does not have a BBC_NO column
sh: convert: command not found
2025-11-24 18:55:12        SEVERE        msmetadata_cmpt.cc::baseband        Exception Reported: This MS's SPECTRAL_WINDOW table does not have a BBC_NO column
sh: convert: command not found
2025-11-24 18:55:14        SEVERE        msmetadata_cmpt.cc::baseband        Exception Reported: This MS's SPECTRAL_WINDOW table does not have a BBC_NO column
sh: convert: command not found
2025-11-24 18:55:19        SEVERE        msmetadata_cmpt.cc::baseband        Exception Reported: This MS's SPECTRAL_WINDOW table does not have a BBC_NO column
sh: convert: command not found
2025-11-24 18:55:21        SEVERE        msmetadata_cmpt.cc::baseband        Exception Reported: This MS's SPECTRAL_WINDOW table does not have a BBC_NO column
2025-11-24 18:55:21        SEVERE        MeasTable::dUTC(Double) (file ../../measures/Measures/MeasTable.cc, line 4290)        Leap second table TAI_UTC seems out-of-date.
2025-11-24 18:55:21        SEVERE        MeasTable::dUTC(Double) (file ../../measures/Measures/MeasTable.cc, line 4290)+        Until the table is updated (see the CASA documentation or your system admin),
2025-11-24 18:55:21        SEVERE        MeasTable::dUTC(Double) (file ../../measures/Measures/MeasTable.cc, line 4290)+        times and coordinates derived from UTC could be wrong by 1s or more.
sh: convert: command not found
2025-11-24 18:55:30        SEVERE        msmetadata_cmpt.cc::baseband        Exception Reported: This MS's SPECTRAL_WINDOW table does not have a BBC_NO column
sh: convert: command not found
2025-11-24 18:56:34        SEVERE        msmetadata_cmpt.cc::baseband        Exception Reported: This MS's SPECTRAL_WINDOW table does not have a BBC_NO column
sh: convert: command not found
2025-11-24 18:56:43        SEVERE        msmetadata_cmpt.cc::baseband        Exception Reported: This MS's SPECTRAL_WINDOW table does not have a BBC_NO column
sh: convert: command not found
2025-11-24 18:56:44        SEVERE        msmetadata_cmpt.cc::baseband        Exception Reported: This MS's SPECTRAL_WINDOW table does not have a BBC_NO column
sh: convert: command not found
2025-11-24 18:56:46        SEVERE        msmetadata_cmpt.cc::baseband        Exception Reported: This MS's SPECTRAL_WINDOW table does not have a BBC_NO column
sh: convert: command not found
sh: convert: command not found
sh: convert: command not found
sh: convert: command not found
sh: convert: command not found
sh: convert: command not found
sh: convert: command not found
sh: convert: command not found
sh: convert: command not found
2025-11-24 18:57:10        WARN        msmetadata_cmpt.cc::spwsforintent        Intent OBSERVE_TARGET#ON_SOURCE does not exist in this dataset.
sh: convert: command not found
sh: convert: command not found
sh: convert: command not found
sh: convert: command not found
sh: convert: command not found
sh: convert: command not found
sh: convert: command not found
2025-11-24 18:58:00        WARN        msmetadata_cmpt.cc::spwsforintent        Intent OBSERVE_TARGET#ON_SOURCE does not exist in this dataset.
sh: convert: command not found
a nosedir
a nosedir/test_task_plotbandpass
a nosedir/xml
a nosedir/xml/test_task_plotbandpass
a nosedir/xml/test_task_plotbandpass/nose.xml
a nosedir/test_task_plotbandpass/conftest.py
a nosedir/test_task_plotbandpass/casa-20251124-185452.log
a nosedir/test_task_plotbandpass/test_task_plotbandpass.py
a nosedir/test_task_plotbandpass/short_summary.log