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
2026-03-03 18:03:03        WARN        concat::::casa        Column WEIGHT_SPECTRUM in table nep3-shrunk.ms has no data. Accessing it will cause errors.
2026-03-03 18:03:24        SEVERE        getcell::TIME        Exception Reported: TableProxy::getCell: no such row
2026-03-03 18:03:24        SEVERE        getcell::TIME        Exception Reported: TableProxy::getCell: no such row
2026-03-03 18:03:24        SEVERE        getcell::TIME        Exception Reported: TableProxy::getCell: no such row
2026-03-03 18:03:24        SEVERE        getcell::TIME        Exception Reported: TableProxy::getCell: no such row
2026-03-03 18:03:24        SEVERE        getcell::TIME        Exception Reported: TableProxy::getCell: no such row
2026-03-03 18:03:24        WARN        MSConcat::concatenate (file ../../ms/MSOper/MSConcat.cc, line 1000)        Zero or negative scan numbers in MS. May lead to duplicate scan numbers in concatenated MS.
2026-03-03 18:03:25        SEVERE        getcell::TIME        Exception Reported: TableProxy::getCell: no such row
2026-03-03 18:03:25        SEVERE        getcell::TIME        Exception Reported: TableProxy::getCell: no such row
2026-03-03 18:03:25        SEVERE        getcell::TIME        Exception Reported: TableProxy::getCell: no such row
2026-03-03 18:03:25        SEVERE        getcell::TIME        Exception Reported: TableProxy::getCell: no such row
2026-03-03 18:03:25        SEVERE        getcell::TIME        Exception Reported: TableProxy::getCell: no such row
2026-03-03 18:03:26        SEVERE        getcell::WEIGHT_SPECTRUM        Exception Reported: Table DataManager error: Invalid operation: TSM: no array in row 0 of column WEIGHT_SPECTRUM in /Users/casaci/bamboohome/xml-data/build-dir/CASASPECS-DEVTESTPY31270-TTARM15PY312/casa6/casatestutils/nosedir/test_task_concat/shortpart1.ms/table.f20
2026-03-03 18:03:26        WARN        concat::::casa        Column WEIGHT_SPECTRUM in table shortpart1.ms has no data. Accessing it will cause errors.
2026-03-03 18:03:26        SEVERE        getcell::WEIGHT_SPECTRUM        Exception Reported: Table DataManager error: Invalid operation: TSM: no array in row 0 of column WEIGHT_SPECTRUM in /Users/casaci/bamboohome/xml-data/build-dir/CASASPECS-DEVTESTPY31270-TTARM15PY312/casa6/casatestutils/nosedir/test_task_concat/shortpart2.ms/table.f20
2026-03-03 18:03:26        WARN        concat::::casa        Column WEIGHT_SPECTRUM in table shortpart2.ms has no data. Accessing it will cause errors.
2026-03-03 18:03:26        SEVERE        getcell::WEIGHT_SPECTRUM        Exception Reported: Table DataManager error: Invalid operation: TSM: no array in row 0 of column WEIGHT_SPECTRUM in /Users/casaci/bamboohome/xml-data/build-dir/CASASPECS-DEVTESTPY31270-TTARM15PY312/casa6/casatestutils/nosedir/test_task_concat/shortpart3.ms/table.f20
2026-03-03 18:03:26        WARN        concat::::casa        Column WEIGHT_SPECTRUM in table shortpart3.ms has no data. Accessing it will cause errors.
2026-03-03 18:03:26        SEVERE        getcell::WEIGHT_SPECTRUM        Exception Reported: Table DataManager error: Invalid operation: TSM: no array in row 0 of column WEIGHT_SPECTRUM in /Users/casaci/bamboohome/xml-data/build-dir/CASASPECS-DEVTESTPY31270-TTARM15PY312/casa6/casatestutils/nosedir/test_task_concat/shortpart4.ms/table.f20
2026-03-03 18:03:26        WARN        concat::::casa        Column WEIGHT_SPECTRUM in table shortpart4.ms has no data. Accessing it will cause errors.
2026-03-03 18:03:26        SEVERE        getcell::WEIGHT_SPECTRUM        Exception Reported: Table DataManager error: Invalid operation: TSM: no array in row 0 of column WEIGHT_SPECTRUM in /Users/casaci/bamboohome/xml-data/build-dir/CASASPECS-DEVTESTPY31270-TTARM15PY312/casa6/casatestutils/nosedir/test_task_concat/shortpart5.ms/table.f20
2026-03-03 18:03:26        WARN        concat::::casa        Column WEIGHT_SPECTRUM in table shortpart5.ms has no data. Accessing it will cause errors.
2026-03-03 18:03:34        SEVERE        getcell::SOURCE_ID        Exception Reported: TableProxy::getCell: no such row
2026-03-03 18:03:34        SEVERE        getcell::TIME        Exception Reported: TableProxy::getCell: no such row
2026-03-03 18:03:34        SEVERE        getcell::WEIGHT_SPECTRUM        Exception Reported: Table DataManager error: Invalid operation: TSM: no array in row 0 of column WEIGHT_SPECTRUM in /Users/casaci/bamboohome/xml-data/build-dir/CASASPECS-DEVTESTPY31270-TTARM15PY312/casa6/casatestutils/nosedir/test_task_concat/A2256LC2_4.5s-1.ms/table.f20
2026-03-03 18:03:34        WARN        concat::::casa        Column WEIGHT_SPECTRUM in table A2256LC2_4.5s-1.ms has no data. Accessing it will cause errors.
2026-03-03 18:03:34        SEVERE        getcell::TIME        Exception Reported: TableProxy::getCell: no such row
2026-03-03 18:03:34        SEVERE        getcell::WEIGHT_SPECTRUM        Exception Reported: Table DataManager error: Invalid operation: TSM: no array in row 0 of column WEIGHT_SPECTRUM in /Users/casaci/bamboohome/xml-data/build-dir/CASASPECS-DEVTESTPY31270-TTARM15PY312/casa6/casatestutils/nosedir/test_task_concat/A2256LC2_4.5s-2.ms/table.f20
2026-03-03 18:03:34        WARN        concat::::casa        Column WEIGHT_SPECTRUM in table A2256LC2_4.5s-2.ms has no data. Accessing it will cause errors.
2026-03-03 18:03:34        SEVERE        getcell::TIME        Exception Reported: TableProxy::getCell: no such row
2026-03-03 18:03:34        SEVERE        getcell::WEIGHT_SPECTRUM        Exception Reported: Table DataManager error: Invalid operation: TSM: no array in row 0 of column WEIGHT_SPECTRUM in /Users/casaci/bamboohome/xml-data/build-dir/CASASPECS-DEVTESTPY31270-TTARM15PY312/casa6/casatestutils/nosedir/test_task_concat/A2256LC2_4.5s-1.ms/table.f20
2026-03-03 18:03:34        WARN        concat::::casa        Column WEIGHT_SPECTRUM in table A2256LC2_4.5s-1.ms has no data. Accessing it will cause errors.
2026-03-03 18:03:34        SEVERE        getcell::TIME        Exception Reported: TableProxy::getCell: no such row
2026-03-03 18:03:34        SEVERE        getcell::WEIGHT_SPECTRUM        Exception Reported: Table DataManager error: Invalid operation: TSM: no array in row 0 of column WEIGHT_SPECTRUM in /Users/casaci/bamboohome/xml-data/build-dir/CASASPECS-DEVTESTPY31270-TTARM15PY312/casa6/casatestutils/nosedir/test_task_concat/A2256LC2_4.5s-2b.ms/table.f20
2026-03-03 18:03:34        WARN        concat::::casa        Column WEIGHT_SPECTRUM in table A2256LC2_4.5s-2b.ms has no data. Accessing it will cause errors.
2026-03-03 18:03:35        WARN        MSConcat::concatenate (file ../../ms/MSOper/MSConcat.cc, line 1000)        Zero or negative scan numbers in MS. May lead to duplicate scan numbers in concatenated MS.
2026-03-03 18:03:35        WARN        MSConcat::concatenate (file ../../ms/MSOper/MSConcat.cc, line 1000)        Zero or negative scan numbers in MS. May lead to duplicate scan numbers in concatenated MS.
2026-03-03 18:03:35        SEVERE        getcell::TIME        Exception Reported: TableProxy::getCell: no such row
2026-03-03 18:03:35        SEVERE        getcell::TIME        Exception Reported: TableProxy::getCell: no such row
2026-03-03 18:03:35        SEVERE        getcell::TIME        Exception Reported: TableProxy::getCell: no such row
2026-03-03 18:03:35        WARN        concat::::casa        The setup of the input MSs is not fully consistent. The concatenation may fail
2026-03-03 18:03:35        WARN        concat::::casa        and/or the affected columns may contain partially only default data.
2026-03-03 18:03:35        WARN        concat::::casa        {'part2-mod2-wscratch.ms': {'Main': {'present_a': True, 'present_b': True, 'missingcol_a': ['CORRECTED_DATA', 'MODEL_DATA'], 'missingcol_b': []}}}
2026-03-03 18:03:41        SEVERE        getcell::TIME        Exception Reported: TableProxy::getCell: no such row
2026-03-03 18:03:41        SEVERE        getcell::TIME        Exception Reported: TableProxy::getCell: no such row
2026-03-03 18:03:41        SEVERE        getcell::TIME        Exception Reported: TableProxy::getCell: no such row
2026-03-03 18:03:41        SEVERE        getcell::TIME        Exception Reported: TableProxy::getCell: no such row
2026-03-03 18:03:41        SEVERE        getcell::TIME        Exception Reported: TableProxy::getCell: no such row
2026-03-03 18:03:41        SEVERE        getcell::TIME        Exception Reported: TableProxy::getCell: no such row
2026-03-03 18:03:41        SEVERE        getcell::TIME        Exception Reported: TableProxy::getCell: no such row
2026-03-03 18:03:41        SEVERE        getcell::TIME        Exception Reported: TableProxy::getCell: no such row
2026-03-03 18:03:41        SEVERE        getcell::TIME        Exception Reported: TableProxy::getCell: no such row
2026-03-03 18:03:41        SEVERE        getcell::TIME        Exception Reported: TableProxy::getCell: no such row
2026-03-03 18:03:41        SEVERE        getcell::WEIGHT_SPECTRUM        Exception Reported: Table DataManager error: Invalid operation: TSM: no array in row 0 of column WEIGHT_SPECTRUM in /Users/casaci/bamboohome/xml-data/build-dir/CASASPECS-DEVTESTPY31270-TTARM15PY312/casa6/casatestutils/nosedir/test_task_testconcat/shortpart1.ms/table.f20
2026-03-03 18:03:41        WARN        testconcat::::casa        Column WEIGHT_SPECTRUM in table shortpart1.ms has no data. Accessing it will cause errors.
2026-03-03 18:03:41        SEVERE        getcell::WEIGHT_SPECTRUM        Exception Reported: Table DataManager error: Invalid operation: TSM: no array in row 0 of column WEIGHT_SPECTRUM in /Users/casaci/bamboohome/xml-data/build-dir/CASASPECS-DEVTESTPY31270-TTARM15PY312/casa6/casatestutils/nosedir/test_task_testconcat/shortpart2.ms/table.f20
2026-03-03 18:03:41        WARN        testconcat::::casa        Column WEIGHT_SPECTRUM in table shortpart2.ms has no data. Accessing it will cause errors.
2026-03-03 18:03:41        SEVERE        getcell::WEIGHT_SPECTRUM        Exception Reported: Table DataManager error: Invalid operation: TSM: no array in row 0 of column WEIGHT_SPECTRUM in /Users/casaci/bamboohome/xml-data/build-dir/CASASPECS-DEVTESTPY31270-TTARM15PY312/casa6/casatestutils/nosedir/test_task_testconcat/shortpart3.ms/table.f20
2026-03-03 18:03:41        WARN        testconcat::::casa        Column WEIGHT_SPECTRUM in table shortpart3.ms has no data. Accessing it will cause errors.
2026-03-03 18:03:41        SEVERE        getcell::WEIGHT_SPECTRUM        Exception Reported: Table DataManager error: Invalid operation: TSM: no array in row 0 of column WEIGHT_SPECTRUM in /Users/casaci/bamboohome/xml-data/build-dir/CASASPECS-DEVTESTPY31270-TTARM15PY312/casa6/casatestutils/nosedir/test_task_testconcat/shortpart4.ms/table.f20
2026-03-03 18:03:41        WARN        testconcat::::casa        Column WEIGHT_SPECTRUM in table shortpart4.ms has no data. Accessing it will cause errors.
2026-03-03 18:03:41        SEVERE        getcell::WEIGHT_SPECTRUM        Exception Reported: Table DataManager error: Invalid operation: TSM: no array in row 0 of column WEIGHT_SPECTRUM in /Users/casaci/bamboohome/xml-data/build-dir/CASASPECS-DEVTESTPY31270-TTARM15PY312/casa6/casatestutils/nosedir/test_task_testconcat/shortpart5.ms/table.f20
2026-03-03 18:03:41        WARN        testconcat::::casa        Column WEIGHT_SPECTRUM in table shortpart5.ms has no data. Accessing it will cause errors.
2026-03-03 18:03:41        SEVERE        getcell::SOURCE_ID        Exception Reported: TableProxy::getCell: no such row
2026-03-03 18:03:41        SEVERE        getcell::TIME        Exception Reported: TableProxy::getCell: no such row
2026-03-03 18:03:41        SEVERE        getcell::WEIGHT_SPECTRUM        Exception Reported: Table DataManager error: Invalid operation: TSM: no array in row 0 of column WEIGHT_SPECTRUM in /Users/casaci/bamboohome/xml-data/build-dir/CASASPECS-DEVTESTPY31270-TTARM15PY312/casa6/casatestutils/nosedir/test_task_testconcat/A2256LC2_4.5s-1.ms/table.f20
2026-03-03 18:03:41        WARN        testconcat::::casa        Column WEIGHT_SPECTRUM in table A2256LC2_4.5s-1.ms has no data. Accessing it will cause errors.
2026-03-03 18:03:41        SEVERE        getcell::TIME        Exception Reported: TableProxy::getCell: no such row
2026-03-03 18:03:41        SEVERE        getcell::WEIGHT_SPECTRUM        Exception Reported: Table DataManager error: Invalid operation: TSM: no array in row 0 of column WEIGHT_SPECTRUM in /Users/casaci/bamboohome/xml-data/build-dir/CASASPECS-DEVTESTPY31270-TTARM15PY312/casa6/casatestutils/nosedir/test_task_testconcat/A2256LC2_4.5s-2.ms/table.f20
2026-03-03 18:03:41        WARN        testconcat::::casa        Column WEIGHT_SPECTRUM in table A2256LC2_4.5s-2.ms has no data. Accessing it will cause errors.
a nosedir
a nosedir/test_task_concat
a nosedir/test_task_virtualconcat
a nosedir/test_task_importfitsidi
a nosedir/xml
a nosedir/test_task_testconcat
a nosedir/test_task_testconcat/conftest.py
a nosedir/test_task_testconcat/test_task_testconcat.py
a nosedir/test_task_testconcat/short_summary.log
a nosedir/test_task_testconcat/casa-20260303-180338.log
a nosedir/xml/test_task_concat
a nosedir/xml/test_task_virtualconcat
a nosedir/xml/test_task_importfitsidi
a nosedir/xml/test_task_testconcat
a nosedir/xml/test_task_testconcat/nose.xml
a nosedir/xml/test_task_importfitsidi/nose.xml
a nosedir/xml/test_task_virtualconcat/nose.xml
a nosedir/xml/test_task_concat/nose.xml
a nosedir/test_task_importfitsidi/casa-20260303-180240.log
a nosedir/test_task_importfitsidi/conftest.py
a nosedir/test_task_importfitsidi/short_summary.log
a nosedir/test_task_importfitsidi/test_task_importfitsidi.py
a nosedir/test_task_virtualconcat/conftest.py
a nosedir/test_task_virtualconcat/casa-20260303-180217.log
a nosedir/test_task_virtualconcat/short_summary.log
a nosedir/test_task_virtualconcat/test_task_virtualconcat.py
a nosedir/test_task_concat/test_task_concat.py
a nosedir/test_task_concat/conftest.py
a nosedir/test_task_concat/casa-20260303-180255.log
a nosedir/test_task_concat/short_summary.log