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  76.1M      0 --:--:-- --:--:-- --:--:-- 76.6M
  % 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   2205      0 --:--:-- --:--:-- --:--:--  2208
  % 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   511  100   511    0     0  16722      0 --:--:-- --:--:-- --:--:-- 16483
Switched to a new branch 'CAS-14726'
Updated 4 paths from 9d4af0691e
Updated 1 path from d0dcee84e9
  % 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  34042      0 --:--:-- --:--:-- --:--:-- 35210
2026-03-24 17:31:14        SEVERE        MeasTable::dUTC(Double) (file ../../measures/Measures/MeasTable.cc, line 4290)        Leap second table TAI_UTC seems out-of-date.
2026-03-24 17:31:14        SEVERE        MeasTable::dUTC(Double) (file ../../measures/Measures/MeasTable.cc, line 4290)+        Until the table is updated (see the CASA documentation or your system admin),
2026-03-24 17:31:14        SEVERE        MeasTable::dUTC(Double) (file ../../measures/Measures/MeasTable.cc, line 4290)+        times and coordinates derived from UTC could be wrong by 1s or more.
2026-03-24 17:31:31        WARN        MSSpw Expression parser::MSSpwIndex::convertToChannelIndex (file ../../ms/MSSel/MSSpwIndex.cc, line 398)        Channel 32 out of range for SPW 0 (valid range 0~31). Limiting it to be within the available range.
2026-03-24 17:31:31        WARN        MSSpw Expression parser::MSSpwIndex::convertToChannelIndex (file ../../ms/MSSel/MSSpwIndex.cc, line 398)        Channel 32 out of range for SPW 0 (valid range 0~31). Limiting it to be within the available range.
2026-03-24 17:31:31        WARN        MSSpw Expression parser::MSSpwIndex::convertToChannelIndex (file ../../ms/MSSel/MSSpwIndex.cc, line 398)        Channel 32 out of range for SPW 0 (valid range 0~31). Limiting it to be within the available range.
2026-03-24 17:31:31        SEVERE        Calibrater::solve        Caught exception: Mismatch with frequency meta-data in append to n08c1.mbdcal detected in spw=0. Check spw selection.
2026-03-24 17:31:31        SEVERE                Exception Reported: Error in Calibrater::solve.
2026-03-24 17:31:31        SEVERE        fringefit::::casa        Task fringefit raised an exception of class RuntimeError with the following message: Error in Calibrater::solve.
a nosedir
a nosedir/xml
a nosedir/test_task_fringefit
a nosedir/test_task_fringefit/conftest.py
a nosedir/test_task_fringefit/casa-20260324-173102.log
a nosedir/test_task_fringefit/test_task_fringefit.py
a nosedir/test_task_fringefit/short_summary.log
a nosedir/xml/test_task_fringefit
a nosedir/xml/test_task_fringefit/nose.xml