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/test_task_appendantab/conftest.py
a nosedir/test_task_appendantab/casa-20261009-170549.log
a nosedir/test_task_appendantab/test_task_appendantab.py
a nosedir/test_task_appendantab/short_summary.log
a nosedir/test_task_getantposalma/conftest.py
a nosedir/test_task_getantposalma/test_task_getantposalma.py
a nosedir/test_task_getantposalma/short_summary.log
a nosedir/test_task_getantposalma/casa-20261009-170531.log
a nosedir/test_task_fringefit/conftest.py
a nosedir/test_task_fringefit/casa-20261009-165644.log
a nosedir/test_task_fringefit/test_task_fringefit.py
a nosedir/test_task_fringefit/short_summary.log
a nosedir/test_task_gaincal/conftest.py
a nosedir/test_task_gaincal/flagged.ms.flagversions
a nosedir/test_task_gaincal/temp.cal.AMP.pol1.log
a nosedir/test_task_gaincal/temp.cal.AMP.pol0.log
a nosedir/test_task_gaincal/temp.cal.PHASE.pol0.log
a nosedir/test_task_gaincal/temp.cal.PHASE.pol1.log
a nosedir/test_task_gaincal/test_task_gaincal.py
a nosedir/test_task_gaincal/casa-20261009-165953.log
a nosedir/test_task_gaincal/short_summary.log
a nosedir/test_task_gaincal/flagged.ms.flagversions/flags.flagdata_1
a nosedir/test_task_gaincal/flagged.ms.flagversions/FLAG_VERSION_LIST
a nosedir/test_task_gaincal/flagged.ms.flagversions/flags.flagdata_2
a nosedir/test_task_gaincal/flagged.ms.flagversions/flags.flagdata_3
a nosedir/xml/test_task_polcal
a nosedir/xml/test_task_getjyperkalma
a nosedir/xml/test_task_exportantab
a nosedir/xml/test_task_getephemtable
a nosedir/xml/test_task_smoothcal
a nosedir/xml/test_task_uvmodelfit
a nosedir/xml/test_task_blcal
a nosedir/xml/test_task_gaincal
a nosedir/xml/test_task_fringefit
a nosedir/xml/test_task_getantposalma
a nosedir/xml/test_task_appendantab
a nosedir/xml/test_task_delmod
a nosedir/xml/test_task_listcal
a nosedir/xml/test_task_getcalmodvla
a nosedir/xml/test_task_rerefant
a nosedir/xml/test_task_bandpass
a nosedir/xml/test_task_gencal
a nosedir/xml/test_task_pccor
a nosedir/xml/test_task_zenithdelaycal
a nosedir/xml/test_task_fluxscale
a nosedir/xml/test_task_defintent
a nosedir/xml/test_task_applycal
a nosedir/xml/test_task_polfromgain
a nosedir/xml/test_task_initweights
a nosedir/xml/test_task_initweights/nose.xml
a nosedir/xml/test_task_polfromgain/nose.xml
a nosedir/xml/test_task_applycal/nose.xml
a nosedir/xml/test_task_defintent/nose.xml
a nosedir/xml/test_task_fluxscale/nose.xml
a nosedir/xml/test_task_zenithdelaycal/nose.xml
a nosedir/xml/test_task_pccor/nose.xml
a nosedir/xml/test_task_gencal/nose.xml
a nosedir/xml/test_task_bandpass/nose.xml
a nosedir/xml/test_task_rerefant/nose.xml
a nosedir/xml/test_task_getcalmodvla/nose.xml
a nosedir/xml/test_task_listcal/nose.xml
a nosedir/xml/test_task_delmod/nose.xml
a nosedir/xml/test_task_appendantab/nose.xml
a nosedir/xml/test_task_getantposalma/nose.xml
a nosedir/xml/test_task_fringefit/nose.xml
a nosedir/xml/test_task_gaincal/nose.xml
a nosedir/xml/test_task_blcal/nose.xml
a nosedir/xml/test_task_uvmodelfit/nose.xml
a nosedir/xml/test_task_smoothcal/nose.xml
a nosedir/xml/test_task_getephemtable/nose.xml
a nosedir/xml/test_task_exportantab/nose.xml
a nosedir/xml/test_task_getjyperkalma/nose.xml
a nosedir/xml/test_task_polcal/nose.xml
a nosedir/test_task_blcal/conftest.py
a nosedir/test_task_blcal/casa-20261009-170223.log
a nosedir/test_task_blcal/short_summary.log
a nosedir/test_task_blcal/test_task_blcal.py
a nosedir/test_task_uvmodelfit/conftest.py
a nosedir/test_task_uvmodelfit/casa-20261009-170517.log
a nosedir/test_task_uvmodelfit/test_task_uvmodelfit.py
a nosedir/test_task_uvmodelfit/short_summary.log
a nosedir/test_task_smoothcal/conftest.py
a nosedir/test_task_smoothcal/test_task_smoothcal.py
a nosedir/test_task_smoothcal/casa-20261009-170626.log
a nosedir/test_task_smoothcal/short_summary.log
a nosedir/test_task_getephemtable/conftest.py
a nosedir/test_task_getephemtable/test_task_getephemtable.py
a nosedir/test_task_getephemtable/casa-20261009-170859.log
a nosedir/test_task_getephemtable/short_summary.log
a nosedir/test_task_exportantab/conftest.py
a nosedir/test_task_exportantab/test_task_exportantab.py
a nosedir/test_task_exportantab/short_summary.log
a nosedir/test_task_exportantab/casa-20261009-170525.log
a nosedir/test_task_getjyperkalma/conftest.py
a nosedir/test_task_getjyperkalma/casa-20261009-170658.log
a nosedir/test_task_getjyperkalma/test_task_getjyperkalma.py
a nosedir/test_task_polcal/conftest.py
a nosedir/test_task_polcal/casa-20261009-170204.log
a nosedir/test_task_polcal/test_task_polcal.py
a nosedir/test_task_polcal/short_summary.log