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_plotweather/short_summary.log
a nosedir/test_task_clearcal/casa-20260317-171733.log
a nosedir/test_task_clearcal/conftest.py
a nosedir/test_task_clearcal/test_task_clearcal.py
a nosedir/test_task_clearcal/short_summary.log
a nosedir/test_task_specsmooth/zz.im
a nosedir/test_task_specsmooth/out3Truec.im
a nosedir/test_task_specsmooth/conftest.py
a nosedir/test_task_specsmooth/out2Truec.im
a nosedir/test_task_specsmooth/out3Truem.im
a nosedir/test_task_specsmooth/out3False.im
a nosedir/test_task_specsmooth/zz_out.im
a nosedir/test_task_specsmooth/out2False.im
a nosedir/test_task_specsmooth/out2Truem.im
a nosedir/test_task_specsmooth/casa-20260317-171822.log
a nosedir/test_task_specsmooth/out4Truec.im
a nosedir/test_task_specsmooth/test_gen.im
a nosedir/test_task_specsmooth/test_task_specsmooth.py
a nosedir/test_task_specsmooth/out5Truec.im
a nosedir/test_task_specsmooth/short_summary.log
a nosedir/test_task_specsmooth/out4False.im
a nosedir/test_task_specsmooth/out4Truem.im
a nosedir/test_task_specsmooth/out5Truem.im
a nosedir/test_task_specsmooth/out5False.im
a nosedir/test_task_exportfits/conftest.py
a nosedir/test_task_exportfits/test_task_exportfits.py
a nosedir/test_task_exportfits/short_summary.log
a nosedir/test_task_exportfits/casa-20260317-165827.log
a nosedir/test_task_exportfits/my.im
a nosedir/test_task_flagcmd/casa-20260317-181403.log
a nosedir/test_task_flagcmd/conftest.py
a nosedir/test_task_flagcmd/test_task_flagcmd.py
a nosedir/test_task_flagcmd/short_summary.log
a nosedir/test_task_makemask/conftest.py
a nosedir/test_task_makemask/elliptical_annulus_crtf.txt
a nosedir/test_task_makemask/test_task_makemask.py
a nosedir/test_task_makemask/short_summary.log
a nosedir/test_task_makemask/casa-20260317-181341.log
a nosedir/test_task_tsdimaging/conftest.py
a nosedir/test_task_tsdimaging/test_task_tsdimaging.py
a nosedir/test_task_tsdimaging/casa-20260317-165840.log
a nosedir/test_task_tsdimaging/short_summary.log
a nosedir/test_task_immoments/conftest.py
a nosedir/test_task_immoments/casa-20260317-173153.log
a nosedir/test_task_immoments/test_task_immoments.py
a nosedir/test_task_immoments/short_summary.log
a nosedir/test_task_sdatmcor/conftest.py
a nosedir/test_task_sdatmcor/test_task_sdatmcor.py
a nosedir/test_task_sdatmcor/casa-20260317-171626.log
a nosedir/test_task_sdatmcor/short_summary.log
a nosedir/test_task_plotbandpass/conftest.py
a nosedir/test_task_plotbandpass/casa-20260317-180212.log
a nosedir/test_task_plotbandpass/test_task_plotbandpass.py
a nosedir/test_task_plotbandpass/short_summary.log
a nosedir/test_task_polcal/conftest.py
a nosedir/test_task_polcal/casa-20260317-181445.log
a nosedir/test_task_polcal/test_task_polcal.py
a nosedir/test_task_polcal/short_summary.log
a nosedir/test_task_spxfit/conftest.py
a nosedir/test_task_spxfit/casa-20260317-165727.log
a nosedir/test_task_spxfit/short_summary.log
a nosedir/test_task_spxfit/test_task_spxfit.py
a nosedir/test_casaxmlutil/casa-20260317-170017.log
a nosedir/test_casaxmlutil/conftest.py
a nosedir/test_casaxmlutil/short_summary.log
a nosedir/test_casaxmlutil/test_casaxmlutil.py
a nosedir/test_task_splattotable/casa-20260317-165747.log
a nosedir/test_task_splattotable/good_table0
a nosedir/test_task_splattotable/conftest.py
a nosedir/test_task_splattotable/good_table01
a nosedir/test_task_splattotable/short_summary.log
a nosedir/test_task_splattotable/test_task_splattotable.py
a nosedir/test_task_concat/test_task_concat.py
a nosedir/test_task_concat/conftest.py
a nosedir/test_task_concat/short_summary.log
a nosedir/test_task_concat/casa-20260317-181232.log
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/xosro2ref.ms.flagversions
a nosedir/test_task_exportasdm/X_osro_013.55979.93803716435
a nosedir/test_task_exportasdm/casa-20260317-180819.log
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
a nosedir/test_task_uvcontsub_old/conftest.py
a nosedir/test_task_uvcontsub_old/casa-20260317-181500.log
a nosedir/test_task_uvcontsub_old/test_task_uvcontsub_old.py
a nosedir/test_task_uvcontsub_old/short_summary.log
a nosedir/test_task_uvcontsub_old/casa-20260317-180528.log
a nosedir/test_imagerhelpers_gclean/conftest.py
a nosedir/test_imagerhelpers_gclean/casa-20260317-171151.log
a nosedir/test_imagerhelpers_gclean/test_imagerhelpers_gclean.py
a nosedir/test_imagerhelpers_gclean/short_summary.log