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
100   201  100   201    0     0   6540      0 --:--:-- --:--:-- --:--:--  6700
  % 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  23468      0 --:--:-- --:--:-- --:--:-- 24333
Switched to a new branch 'CAS-14624'
Updated 1 path from adeece0e42
Updated 1 path from 05d56ffaf7
  % 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  53507      0 --:--:-- --:--:-- --:--:-- 55750
2025-12-03 16:37:22        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
2025-12-03 16:37:22        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
2025-12-03 16:37:22        WARN        componentlist::close        componentlist closed
Could not understand frequency frame..defaulting to LSRK
2025-12-03 16:37:23        WARN        componentlist::close        componentlist closed
2025-12-03 16:37:23        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
2025-12-03 16:37:23        WARN        componentlist::close        componentlist closed
2025-12-03 16:37:23        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
2025-12-03 16:37:24        WARN        componentlist::close        componentlist closed
2025-12-03 16:37:24        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
2025-12-03 16:37:25        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/casa-20251203-163708.log
a nosedir/test_task_ft/test_task_ft.py
a nosedir/test_task_ft/short_summary.log