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
2025-12-26 08:11:18        WARN        ImageFitter::_finishConstruction        Unrecognized intensity unit . Will assume Jy/pixel
2025-12-26 08:11:18        WARN        ImageFitter::clearNoiseFWHM        noiseFWHM not specified and image has no beam, using uncorrelated noise expressions to calculate uncertainties
2025-12-26 08:11:18        WARN        SkyCompRep::convertToJy        Cannot convert units of brightness to Jy - will assume Jy
2025-12-26 08:11:18        WARN        SkyCompRep::peakToIntegralFlux()        There are no image brightness units, assuming Jy/pixel
2025-12-26 08:11:18        WARN        SkyCompRep::integralToPeakFlux()        There are no image brightness units, assuming Jy/pixel
2025-12-26 08:11:18        WARN        ImageFitter::_finishConstruction        Unrecognized intensity unit . Will assume Jy/pixel
2025-12-26 08:11:18        WARN        ImageFitter::clearNoiseFWHM        noiseFWHM not specified and image has no beam, using uncorrelated noise expressions to calculate uncertainties
2025-12-26 08:11:18        WARN        SkyCompRep::convertToJy        Cannot convert units of brightness to Jy - will assume Jy
2025-12-26 08:11:18        WARN        SkyCompRep::peakToIntegralFlux()        There are no image brightness units, assuming Jy/pixel
2025-12-26 08:11:18        WARN        SkyCompRep::integralToPeakFlux()        There are no image brightness units, assuming Jy/pixel
2025-12-26 08:11:18        WARN        ImageFitter::_finishConstruction        Unrecognized intensity unit . Will assume Jy/pixel
2025-12-26 08:11:18        WARN        ImageFitter::clearNoiseFWHM        noiseFWHM not specified and image has no beam, using uncorrelated noise expressions to calculate uncertainties
2025-12-26 08:11:18        WARN        SkyCompRep::convertToJy        Cannot convert units of brightness to Jy - will assume Jy
2025-12-26 08:11:18        WARN        SkyCompRep::peakToIntegralFlux()        There are no image brightness units, assuming Jy/pixel
2025-12-26 08:11:18        WARN        SkyCompRep::integralToPeakFlux()        There are no image brightness units, assuming Jy/pixel
2025-12-26 08:11:18        WARN        ImageFitter::_finishConstruction        Unrecognized intensity unit . Will assume Jy/pixel
2025-12-26 08:11:18        WARN        ImageFitter::clearNoiseFWHM        noiseFWHM not specified and image has no beam, using uncorrelated noise expressions to calculate uncertainties
2025-12-26 08:11:18        WARN        SkyCompRep::convertToJy        Cannot convert units of brightness to Jy - will assume Jy
2025-12-26 08:11:18        WARN        SkyCompRep::peakToIntegralFlux()        There are no image brightness units, assuming Jy/pixel
2025-12-26 08:11:18        WARN        SkyCompRep::integralToPeakFlux()        There are no image brightness units, assuming Jy/pixel
2025-12-26 08:11:18        WARN        ImageFitter::_finishConstruction        Unrecognized intensity unit . Will assume Jy/pixel
2025-12-26 08:11:18        WARN        ImageFitter::clearNoiseFWHM        noiseFWHM not specified and image has no beam, using uncorrelated noise expressions to calculate uncertainties
2025-12-26 08:11:18        WARN        SkyCompRep::convertToJy        Cannot convert units of brightness to Jy - will assume Jy
2025-12-26 08:11:18        WARN        SkyCompRep::peakToIntegralFlux()        There are no image brightness units, assuming Jy/pixel
2025-12-26 08:11:19        WARN        SkyCompRep::integralToPeakFlux()        There are no image brightness units, assuming Jy/pixel
2025-12-26 08:11:19        WARN        ImageFitter::_finishConstruction        Unrecognized intensity unit . Will assume Jy/pixel
2025-12-26 08:11:19        WARN        ImageFitter::clearNoiseFWHM        noiseFWHM not specified and image has no beam, using uncorrelated noise expressions to calculate uncertainties
2025-12-26 08:11:19        WARN        SkyCompRep::convertToJy        Cannot convert units of brightness to Jy - will assume Jy
2025-12-26 08:11:19        WARN        SkyCompRep::peakToIntegralFlux()        There are no image brightness units, assuming Jy/pixel
2025-12-26 08:11:19        WARN        SkyCompRep::integralToPeakFlux()        There are no image brightness units, assuming Jy/pixel
2025-12-26 08:11:19        WARN        ImageFitter::_finishConstruction        Unrecognized intensity unit . Will assume Jy/pixel
2025-12-26 08:11:19        WARN        ImageFitter::clearNoiseFWHM        noiseFWHM not specified and image has no beam, using uncorrelated noise expressions to calculate uncertainties
2025-12-26 08:11:19        WARN        SkyCompRep::convertToJy        Cannot convert units of brightness to Jy - will assume Jy
2025-12-26 08:11:19        WARN        SkyCompRep::peakToIntegralFlux()        There are no image brightness units, assuming Jy/pixel
2025-12-26 08:11:19        WARN        SkyCompRep::integralToPeakFlux()        There are no image brightness units, assuming Jy/pixel
2025-12-26 08:11:19        WARN        ImageFitter::_finishConstruction        Unrecognized intensity unit . Will assume Jy/pixel
2025-12-26 08:11:19        WARN        ImageFitter::clearNoiseFWHM        noiseFWHM not specified and image has no beam, using uncorrelated noise expressions to calculate uncertainties
2025-12-26 08:11:19        WARN        SkyCompRep::convertToJy        Cannot convert units of brightness to Jy - will assume Jy
2025-12-26 08:11:19        WARN        SkyCompRep::peakToIntegralFlux()        There are no image brightness units, assuming Jy/pixel
2025-12-26 08:11:19        WARN        SkyCompRep::integralToPeakFlux()        There are no image brightness units, assuming Jy/pixel
2025-12-26 08:11:20        WARN        ImageFitter::_finishConstruction        Unrecognized intensity unit . Will assume Jy/pixel
2025-12-26 08:11:20        WARN        ImageFitter::clearNoiseFWHM        noiseFWHM not specified and image has no beam, using uncorrelated noise expressions to calculate uncertainties
2025-12-26 08:11:20        WARN        SkyCompRep::convertToJy        Cannot convert units of brightness to Jy - will assume Jy
2025-12-26 08:11:20        WARN        SkyCompRep::peakToIntegralFlux()        There are no image brightness units, assuming Jy/pixel
2025-12-26 08:11:20        WARN        SkyCompRep::integralToPeakFlux()        There are no image brightness units, assuming Jy/pixel
2025-12-26 08:11:20        WARN        imregrid::ImageRegridder::_doImagesOverlap        At least one of the images exceeds one degree on at one side, not checking for direction plane overlap.
2025-12-26 08:11:20        SEVERE        imregrid::image::regrid        Exception Reported: Exception: Input image and template coordinate system have no common stokes..
2025-12-26 08:11:20        SEVERE        imregrid::image::regrid+        ... thrown by void casa::ImageRegridderBase<float>::_finishConstruction() [T = float] at File: /Users/casaci/bamboohome/xml-data/build-dir/CASASPECS-DBC171-BPO15AP312/casainstall/include/casacpp/imageanalysis/ImageAnalysis/ImageRegridderBase.tcc, line: 142
2025-12-26 08:11:20        SEVERE        imregrid::::casa        Task imregrid raised an exception of class RuntimeError with the following message: Exception: Input image and template coordinate system have no common stokes..
2025-12-26 08:11:20        SEVERE        imregrid::::casa+        ... thrown by void casa::ImageRegridderBase<float>::_finishConstruction() [T = float] at File: /Users/casaci/bamboohome/xml-data/build-dir/CASASPECS-DBC171-BPO15AP312/casainstall/include/casacpp/imageanalysis/ImageAnalysis/ImageRegridderBase.tcc, line: 142
2025-12-26 08:11:20        SEVERE        imregrid::image::regrid        Exception Reported: Exception: Specified output stokes axis length (3) does not match the number of common stokes (1) in the input image and template coordinate system..
2025-12-26 08:11:20        SEVERE        imregrid::image::regrid+        ... thrown by void casa::ImageRegridderBase<float>::_finishConstruction() [T = float] at File: /Users/casaci/bamboohome/xml-data/build-dir/CASASPECS-DBC171-BPO15AP312/casainstall/include/casacpp/imageanalysis/ImageAnalysis/ImageRegridderBase.tcc, line: 153
2025-12-26 08:11:20        SEVERE        imregrid::::casa        Task imregrid raised an exception of class RuntimeError with the following message: Exception: Specified output stokes axis length (3) does not match the number of common stokes (1) in the input image and template coordinate system..
2025-12-26 08:11:20        SEVERE        imregrid::::casa+        ... thrown by void casa::ImageRegridderBase<float>::_finishConstruction() [T = float] at File: /Users/casaci/bamboohome/xml-data/build-dir/CASASPECS-DBC171-BPO15AP312/casainstall/include/casacpp/imageanalysis/ImageAnalysis/ImageRegridderBase.tcc, line: 153
a nosedir
a nosedir/test_task_tsdimaging
a nosedir/summary_of_failed.log
a nosedir/xml
a nosedir/test_task_sdfixscan
a nosedir/test_task_simobserve
a nosedir/test_task_simanalyze
a nosedir/test_task_setjy
a nosedir/test_task_imregrid
a nosedir/test_task_imregrid/conftest.py
a nosedir/test_task_imregrid/test_task_imregrid.py
a nosedir/test_task_imregrid/casa-20251226-081037.log
a nosedir/test_task_imregrid/short_summary.log
a nosedir/test_task_setjy/test_task_setjy.py
a nosedir/test_task_setjy/conftest.py
a nosedir/test_task_setjy/casa-20251226-080553.log
a nosedir/test_task_setjy/short_summary.log
a nosedir/test_task_simanalyze/conftest.py
a nosedir/test_task_simanalyze/test_task_simanalyze.py
a nosedir/test_task_simanalyze/casa-20251226-080659.log
a nosedir/test_task_simanalyze/short_summary.log
a nosedir/test_task_simobserve/conftest.py
a nosedir/test_task_simobserve/test_task_simobserve.py
a nosedir/test_task_simobserve/casa-20251226-080710.log
a nosedir/test_task_simobserve/short_summary.log
a nosedir/test_task_simobserve/sim
a nosedir/test_task_sdfixscan/conftest.py
a nosedir/test_task_sdfixscan/test_task_sdfixscan.py
a nosedir/test_task_sdfixscan/short_summary.log
a nosedir/test_task_sdfixscan/casa-20251226-080834.log
a nosedir/xml/test_task_tsdimaging
a nosedir/xml/test_task_sdfixscan
a nosedir/xml/test_task_simobserve
a nosedir/xml/test_task_simanalyze
a nosedir/xml/test_task_setjy
a nosedir/xml/test_task_imregrid
a nosedir/xml/test_task_imregrid/nose.xml
a nosedir/xml/test_task_setjy/nose.xml
a nosedir/xml/test_task_simanalyze/nose.xml
a nosedir/xml/test_task_simobserve/nose.xml
a nosedir/xml/test_task_sdfixscan/nose.xml
a nosedir/xml/test_task_tsdimaging/nose.xml
a nosedir/test_task_tsdimaging/conftest.py
a nosedir/test_task_tsdimaging/casa-20251226-080839.log
a nosedir/test_task_tsdimaging/test_task_tsdimaging.py
a nosedir/test_task_tsdimaging/short_summary.log