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/summary_of_failed.log
a nosedir/test_task_sdfit
a nosedir/xml
a nosedir/test_task_sdtimeaverage
a nosedir/test_task_sdgaincal
a nosedir/test_task_sdcal
a nosedir/test_task_gencal
a nosedir/test_task_sdfixscan
a nosedir/test_task_imbaseline
a nosedir/test_task_sdsmooth
a nosedir/test_jyperk
a nosedir/test_jyperk/conftest.py
a nosedir/test_jyperk/test_jyperk.py
a nosedir/test_jyperk/casa-20260205-091503.log
a nosedir/test_jyperk/short_summary.log
a nosedir/test_task_sdsmooth/test_task_sdsmooth.py
a nosedir/test_task_sdsmooth/conftest.py
a nosedir/test_task_sdsmooth/short_summary.log
a nosedir/test_task_sdsmooth/casa-20260205-091836.log
a nosedir/test_task_imbaseline/conftest.py
a nosedir/test_task_imbaseline/casa-20260205-091507.log
a nosedir/test_task_imbaseline/test_task_imbaseline.py
a nosedir/test_task_sdfixscan/conftest.py
a nosedir/test_task_sdfixscan/test_task_sdfixscan.py
a nosedir/test_task_sdfixscan/casa-20260205-091915.log
a nosedir/test_task_sdfixscan/short_summary.log
a nosedir/test_task_gencal/conftest.py
a nosedir/test_task_gencal/casa-20260205-091328.log
a nosedir/test_task_gencal/test_task_gencal.py
a nosedir/test_task_gencal/short_summary.log
a nosedir/test_task_sdcal/conftest.py
a nosedir/test_task_sdcal/casa-20260205-091845.log
a nosedir/test_task_sdcal/short_summary.log
a nosedir/test_task_sdcal/test_task_sdcal.py
a nosedir/test_task_sdgaincal/test_task_sdgaincal.py
a nosedir/test_task_sdgaincal/conftest.py
a nosedir/test_task_sdgaincal/casa-20260205-091918.log
a nosedir/test_task_sdgaincal/short_summary.log
a nosedir/test_task_sdtimeaverage/conftest.py
a nosedir/test_task_sdtimeaverage/test_task_sdtimeaverage.py
a nosedir/test_task_sdtimeaverage/casa-20260205-091311.log
a nosedir/test_task_sdtimeaverage/short_summary.log
a nosedir/xml/test_casaxmlutil
a nosedir/xml/test_task_sdatmcor
a nosedir/xml/test_task_sdsidebandsplit
a nosedir/xml/test_task_nrobeamaverage
a nosedir/xml/test_task_sdbaseline
a nosedir/xml/test_task_sdpolaverage
a nosedir/xml/test_task_sdfit
a nosedir/xml/test_task_sdtimeaverage
a nosedir/xml/test_task_sdgaincal
a nosedir/xml/test_task_sdcal
a nosedir/xml/test_task_gencal
a nosedir/xml/test_task_sdfixscan
a nosedir/xml/test_task_imbaseline
a nosedir/xml/test_task_sdsmooth
a nosedir/xml/test_jyperk
a nosedir/xml/test_jyperk/nose.xml
a nosedir/xml/test_task_sdsmooth/nose.xml
a nosedir/xml/test_task_imbaseline/nose.xml
a nosedir/xml/test_task_sdfixscan/nose.xml
a nosedir/xml/test_task_gencal/nose.xml
a nosedir/xml/test_task_sdcal/nose.xml
a nosedir/xml/test_task_sdgaincal/nose.xml
a nosedir/xml/test_task_sdtimeaverage/nose.xml
a nosedir/xml/test_task_sdfit/nose.xml
a nosedir/xml/test_task_sdpolaverage/nose.xml
a nosedir/xml/test_task_sdbaseline/nose.xml
a nosedir/xml/test_task_nrobeamaverage/nose.xml
a nosedir/xml/test_task_sdsidebandsplit/nose.xml
a nosedir/xml/test_task_sdatmcor/nose.xml
a nosedir/xml/test_casaxmlutil/nose.xml
a nosedir/test_task_sdfit/conftest.py
a nosedir/test_task_sdfit/casa-20260205-091451.log
a nosedir/test_task_sdfit/test_task_sdfit.py
a nosedir/test_task_sdfit/short_summary.log
a nosedir/test_task_sdpolaverage/conftest.py
a nosedir/test_task_sdpolaverage/casa-20260205-091908.log
a nosedir/test_task_sdpolaverage/short_summary.log
a nosedir/test_task_sdpolaverage/test_task_sdpolaverage.py
a nosedir/test_task_sdbaseline/conftest.py
a nosedir/test_task_sdbaseline/test_task_sdbaseline.py
a nosedir/test_task_sdbaseline/casa-20260205-091405.log
a nosedir/test_task_sdbaseline/short_summary.log
a nosedir/test_task_nrobeamaverage/conftest.py
a nosedir/test_task_nrobeamaverage/short_summary.log
a nosedir/test_task_nrobeamaverage/casa-20260205-091148.log
a nosedir/test_task_nrobeamaverage/test_task_nrobeamaverage.py
a nosedir/test_task_sdsidebandsplit/conftest.py
a nosedir/test_task_sdsidebandsplit/casa-20260205-091911.log
a nosedir/test_task_sdsidebandsplit/short_summary.log
a nosedir/test_task_sdsidebandsplit/test_task_sdsidebandsplit.py
a nosedir/test_task_sdatmcor/conftest.py
a nosedir/test_task_sdatmcor/test_task_sdatmcor.py
a nosedir/test_task_sdatmcor/short_summary.log
a nosedir/test_task_sdatmcor/casa-20260205-091212.log
a nosedir/test_casaxmlutil/conftest.py
a nosedir/test_casaxmlutil/short_summary.log
a nosedir/test_casaxmlutil/casa-20260205-091358.log
a nosedir/test_casaxmlutil/test_casaxmlutil.py