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
a nosedir/xml/test_tool_sdm_toms
a nosedir/xml/test_tool_image_regrid
a nosedir/xml/test_tool_table
a nosedir/xml/test_tool_table/nose.xml
a nosedir/xml/test_tool_image_regrid/nose.xml
a nosedir/xml/test_tool_sdm_toms/nose.xml
a nosedir/xml/test_tool_image_rebin/nose.xml
a nosedir/xml/test_tool_linearmosaic/nose.xml
a nosedir/xml/test_tool_quanta/nose.xml
a nosedir/xml/test_tool_calibrater/nose.xml
a nosedir/xml/test_tool_regionmanager/nose.xml
a nosedir/xml/test_tool_vpmanager/nose.xml
a nosedir/xml/test_tool_calanalysis/nose.xml
a nosedir/xml/test_tool_synthesisutils/nose.xml
a nosedir/xml/test_tool_image_collapse/nose.xml
a nosedir/xml/test_tool_image_transpose/nose.xml
a nosedir/xml/test_tool_agentflagger/nose.xml
a nosedir/xml/test_tool_sdm/nose.xml
a nosedir/xml/test_tool_image_pv/nose.xml
a nosedir/xml/test_tool_image_fitprofile/nose.xml
a nosedir/xml/test_tool_image_statistics/nose.xml
a nosedir/xml/test_tool_coordsys/nose.xml
a nosedir/xml/test_tool_measures/nose.xml
a nosedir/xml/test_tool_simulator/nose.xml
a nosedir/xml/test_tool_ms/nose.xml
a nosedir/xml/test_tool_logsink/nose.xml
a nosedir/xml/test_tool_image_subimage/nose.xml
a nosedir/xml/test_tool_componentlist/nose.xml
a nosedir/xml/test_tool_imagepol/nose.xml
a nosedir/xml/test_tool_msmetadata/nose.xml
a nosedir/xml/test_tool_ms_createmultims/nose.xml
a nosedir/xml/test_tool_image_pbcor/nose.xml
a nosedir/xml/test_tool_ms_statwt/nose.xml
a nosedir/xml/test_tool_image/nose.xml
a nosedir/xml/test_tool_image_deviation/nose.xml
a nosedir/xml/test_tool_msuvbinner/nose.xml
a nosedir/test_tool_image_statistics/test_tool_image_statistics.py
a nosedir/test_tool_image_statistics/conftest.py
a nosedir/test_tool_image_statistics/casa-20250825-164421.log
a nosedir/test_tool_image_statistics/short_summary.log
a nosedir/test_tool_coordsys/conftest.py
a nosedir/test_tool_coordsys/test_tool_coordsys.py
a nosedir/test_tool_coordsys/casa-20250825-164437.log
a nosedir/test_tool_coordsys/short_summary.log
a nosedir/test_tool_measures/conftest.py
a nosedir/test_tool_measures/test_tool_measures.py
a nosedir/test_tool_measures/short_summary.log
a nosedir/test_tool_measures/casa-20250825-164332.log
a nosedir/test_tool_simulator/conftest.py
a nosedir/test_tool_simulator/short_summary.log
a nosedir/test_tool_simulator/test_tool_simulator.py
a nosedir/test_tool_simulator/casa-20250825-164240.log
a nosedir/test_tool_ms/conftest.py
a nosedir/test_tool_ms/test_tool_ms.py
a nosedir/test_tool_ms/casa-20250825-164356.log
a nosedir/test_tool_ms/short_summary.log
a nosedir/test_tool_logsink/conftest.py
a nosedir/test_tool_logsink/test_tool_logsink.py
a nosedir/test_tool_logsink/casa-20250825-164432.log
a nosedir/test_tool_logsink/short_summary.log
a nosedir/test_tool_image_subimage/conftest.py
a nosedir/test_tool_image_subimage/casa-20250825-164407.log
a nosedir/test_tool_image_subimage/short_summary.log
a nosedir/test_tool_image_subimage/test_tool_image_subimage.py
a nosedir/test_tool_componentlist/conftest.py
a nosedir/test_tool_componentlist/test_tool_componentlist.py
a nosedir/test_tool_componentlist/casa-20250825-164439.log
a nosedir/test_tool_componentlist/short_summary.log
a nosedir/test_tool_imagepol/conftest.py
a nosedir/test_tool_imagepol/short_summary.log
a nosedir/test_tool_imagepol/casa-20250825-164244.log
a nosedir/test_tool_imagepol/test_tool_imagepol.py
a nosedir/test_tool_msmetadata/casa-20250825-164449.log
a nosedir/test_tool_msmetadata/conftest.py
a nosedir/test_tool_msmetadata/test_tool_msmetadata.py
a nosedir/test_tool_msmetadata/short_summary.log
a nosedir/test_tool_ms_createmultims/conftest.py
a nosedir/test_tool_ms_createmultims/test_tool_ms_createmultims.py
a nosedir/test_tool_ms_createmultims/casa-20250825-164434.log
a nosedir/test_tool_ms_createmultims/short_summary.log
a nosedir/test_tool_image_pbcor/test_tool_image_pbcor.py
a nosedir/test_tool_image_pbcor/conftest.py
a nosedir/test_tool_image_pbcor/short_summary.log
a nosedir/test_tool_image_pbcor/casa-20250825-164318.log
a nosedir/test_tool_ms_statwt/conftest.py
a nosedir/test_tool_ms_statwt/short_summary.log
a nosedir/test_tool_ms_statwt/casa-20250825-164442.log
a nosedir/test_tool_ms_statwt/test_tool_ms_statwt.py
a nosedir/test_tool_image/conftest.py
a nosedir/test_tool_image/test_tool_image.py
a nosedir/test_tool_image/short_summary.log
a nosedir/test_tool_image/casa-20250825-164452.log
a nosedir/test_tool_image_deviation/conftest.py
a nosedir/test_tool_image_deviation/casa-20250825-164354.log
a nosedir/test_tool_image_deviation/test_tool_image_deviation.py
a nosedir/test_tool_image_deviation/short_summary.log
a nosedir/test_tool_msuvbinner/conftest.py
a nosedir/test_tool_msuvbinner/test_tool_msuvbinner.py
a nosedir/test_tool_msuvbinner/short_summary.log
a nosedir/test_tool_msuvbinner/casa-20250825-164242.log