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-05-19 04:36:19        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:19        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:19        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:19        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:19        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:19        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:19        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:19        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:19        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:19        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:19        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:19        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:19        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:19        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:19        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:19        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:19        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:19        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:19        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:19        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:19        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:19        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:19        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:19        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:19        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:19        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:19        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:19        WARN        MS2ASDM::writeState()        MS State table is empty. Creating ASDM State table with one on-source entry.
2026-05-19 04:36:19        WARN        MS2ASDM::writeSysCal()        MS SysCal table doesn't exist or is empty. Creating ASDM SysCal table with default entries.
2026-05-19 04:36:19        WARN        MS2ASDM::writeConfigDesc()        MS Processor table is empty. Will assume processor type is CORRELATOR.
2026-05-19 04:36:19        WARN        MS2ASDM::writeConfigDesc()           Still, the MS Main table seems to refer to an existing processor id 0. Will try to proceed ...
2026-05-19 04:36:19        WARN        MS2ASDM::writeSBSummaryAndExecBlockStubs()        Observation time range is zero length for obs ID 20 in MS Observation table.
2026-05-19 04:36:19        WARN        MS2ASDM::writeSBSummaryAndExecBlockStubs()+         Will try to proceed ...
2026-05-19 04:36:20        WARN        MS2ASDM::writePointing()        No ENCODER column in MS Pointing table. Will use DIRECTION instead.
xmllint: using libxml version 21305
   compiled with: Threads Tree Output Push Reader Patterns Writer SAXv1 FTP HTTP DTDValid HTML C14N Catalog XPath XPointer XInclude Iconv ICU ISO8859X Unicode Regexps Automata Schemas Schematron Modules Debug Zlib Lzma
2026-05-19 04:36:20        WARN        MS2ASDM::writeProcessor()        MS Processor table is empty. Will try to proceed assuming a standard ALMA Correlator.
2026-05-19 04:36:20        WARN        MS2ASDM::writeCorrelatorMode()        Unknown telescope name: BIMA. Assuming ALMA_BASELINE.
2026-05-19 04:36:20        WARN        MS2ASDM::writeFeed()        Setting receiver ID to zero (ALMA convention).
2026-05-19 04:36:20        WARN        MS2ASDM::writeFeed()        Assuming single-feed receivers. Setting FeedNum to 1 (as for ALMA).
2026-05-19 04:36:20        WARN        MS2ASDM::writeState()        MS State table is empty. Creating ASDM State table with one on-source entry.
2026-05-19 04:36:20        WARN        MS2ASDM::writeSysCal()        MS SysCal table doesn't exist or is empty. Creating ASDM SysCal table with default entries.
2026-05-19 04:36:20        WARN        MS2ASDM::writeConfigDesc()        MS Processor table is empty. Will assume processor type is CORRELATOR.
2026-05-19 04:36:20        WARN        MS2ASDM::writeSBSummaryAndExecBlockStubs()        Observation time range is zero length for obs ID 0 in MS Observation table.
2026-05-19 04:36:20        WARN        MS2ASDM::writeSBSummaryAndExecBlockStubs()+         Will try to proceed ...
2026-05-19 04:36:20        WARN        MS2ASDM::writePointing()        MS Pointing table doesn't exist or is empty.
xmllint: using libxml version 21305
   compiled with: Threads Tree Output Push Reader Patterns Writer SAXv1 FTP HTTP DTDValid HTML C14N Catalog XPath XPointer XInclude Iconv ICU ISO8859X Unicode Regexps Automata Schemas Schematron Modules Debug Zlib Lzma
2026-05-19 04:36:21        WARN        MS2ASDM::writeProcessor()        MS Processor table is empty. Will try to proceed assuming a standard ALMA Correlator.
2026-05-19 04:36:21        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:21        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:21        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:21        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:21        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:21        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:21        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:21        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:21        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:21        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:21        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:21        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:21        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:21        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:21        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:21        WARN        MS2ASDM::writeFeed()        MS Feed table contains reference to a Beam table row 0 but a Beam table is not implemented in CASA. Ignoring.
2026-05-19 04:36:21        WARN        MS2ASDM::writeState()        MS State table is empty. Creating ASDM State table with one on-source entry.
2026-05-19 04:36:21        WARN        MS2ASDM::writeSysCal()        MS SysCal table doesn't exist or is empty. Creating ASDM SysCal table with default entries.
2026-05-19 04:36:21        WARN        MS2ASDM::writeConfigDesc()        MS Processor table is empty. Will assume processor type is CORRELATOR.
2026-05-19 04:36:21        WARN        MS2ASDM::writeConfigDesc()           Still, the MS Main table seems to refer to an existing processor id 0. Will try to proceed ...
2026-05-19 04:36:21        WARN        MS2ASDM::writePointing()        No ENCODER column in MS Pointing table. Will use DIRECTION instead.
xmllint: using libxml version 21305
   compiled with: Threads Tree Output Push Reader Patterns Writer SAXv1 FTP HTTP DTDValid HTML C14N Catalog XPath XPointer XInclude Iconv ICU ISO8859X Unicode Regexps Automata Schemas Schematron Modules Debug Zlib Lzma
a nosedir
a nosedir/test_task_exportasdm
a nosedir/summary_of_failed.log
a nosedir/test_task_importasdm
a nosedir/xml
a nosedir/xml/test_task_exportasdm
a nosedir/xml/test_task_importasdm
a nosedir/xml/test_task_importasdm/nose.xml
a nosedir/xml/test_task_exportasdm/nose.xml
a nosedir/test_task_importasdm/casa-20260519-042912.log
a nosedir/test_task_importasdm/conftest.py
a nosedir/test_task_importasdm/short_summary.log
a nosedir/test_task_importasdm/test_task_importasdm.py
a nosedir/test_task_exportasdm/test_task_exportasdm.py
a nosedir/test_task_exportasdm/conftest.py
a nosedir/test_task_exportasdm/xosro2ref-reimp.ms.flagversions
a nosedir/test_task_exportasdm/casa-20260519-043604.log
a nosedir/test_task_exportasdm/xosro2ref.ms.flagversions
a nosedir/test_task_exportasdm/X_osro_013.55979.93803716435
a nosedir/test_task_exportasdm/uid___A002_X72bc38_X000
a nosedir/test_task_exportasdm/asdm.ms.flagversions
a nosedir/test_task_exportasdm/short_summary.log
a nosedir/test_task_exportasdm/asdm.ms.flagversions/FLAG_VERSION_LIST
a nosedir/test_task_exportasdm/asdm.ms.flagversions/flags.Original
a nosedir/test_task_exportasdm/xosro2ref.ms.flagversions/FLAG_VERSION_LIST
a nosedir/test_task_exportasdm/xosro2ref.ms.flagversions/flags.Original
a nosedir/test_task_exportasdm/xosro2ref-reimp.ms.flagversions/FLAG_VERSION_LIST
a nosedir/test_task_exportasdm/xosro2ref-reimp.ms.flagversions/flags.Original