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  31.9M      0 --:--:-- --:--:-- --:--:-- 32.0M
  % 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   3019      0 --:--:-- --:--:-- --:--:--  3045
  % 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   7555      0 --:--:-- --:--:-- --:--:--  7626
Switched to a new branch 'CAS-14624'
Updated 1 path from 7310fe4c0a
Updated 1 path from 4c99b92fff
  % 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  42565      0 --:--:-- --:--:-- --:--:-- 44600
2026-03-16 16:31:54        SEVERE        ft::::casa        Task ft raised an exception of class ValueError with the following message: If any of the selection parameters timerange, uvrange, antenna, scan, observation or intent are not the default ones then usescratch must be set to True
2026-03-16 16:31:55        SEVERE        ft::::casa        Task ft raised an exception of class ValueError with the following message: If any of the selection parameters timerange, uvrange, antenna, scan, observation or intent are not the default ones then usescratch must be set to True
Could not understand frequency frame..defaulting to LSRK
2026-03-16 16:31:55        WARN        componentlist::close        componentlist closed
Could not understand frequency frame..defaulting to LSRK
2026-03-16 16:31:56        WARN        componentlist::close        componentlist closed
2026-03-16 16:31:57        SEVERE        ft::::casa        Task ft raised an exception of class ValueError with the following message: If any of the selection parameters timerange, uvrange, antenna, scan, observation or intent are not the default ones then usescratch must be set to True
2026-03-16 16:31:57        WARN        componentlist::close        componentlist closed
2026-03-16 16:31:57        SEVERE        ft::::casa        Task ft raised an exception of class ValueError with the following message: If any of the selection parameters timerange, uvrange, antenna, scan, observation or intent are not the default ones then usescratch must be set to True
Could not understand frequency frame..defaulting to LSRK
2026-03-16 16:31:58        WARN        componentlist::close        componentlist closed
2026-03-16 16:31:59        SEVERE        ft::::casa        Task ft raised an exception of class ValueError with the following message: If any of the selection parameters timerange, uvrange, antenna, scan, observation or intent are not the default ones then usescratch must be set to True
2026-03-16 16:32:00        SEVERE        ft::::casa        Task ft raised an exception of class ValueError with the following message: If any of the selection parameters timerange, uvrange, antenna, scan, observation or intent are not the default ones then usescratch must be set to True
a nosedir
a nosedir/test_task_ft
a nosedir/xml
a nosedir/xml/test_task_ft
a nosedir/xml/test_task_ft/nose.xml
a nosedir/test_task_ft/conftest.py
a nosedir/test_task_ft/test_task_ft.py
a nosedir/test_task_ft/casa-20260316-163137.log
a nosedir/test_task_ft/short_summary.log