Hi,
My run is failing immediately in fcm_make_um with this error:
[FAIL] um/src/atmosphere/UKCA/asad_flux_dat.F90: merge results in conflict
[FAIL] merge output: /home/n02/n02/s2261584/cylc-run/u-dq440/share/fcm_make_um/.fcm-make/extract/merge/um/src/atmosphere/UKCA/asad_flux_dat.F90.diff
[FAIL] source from location 0: svn://puma2.archer2.ac.uk/um.xm/main/trunk/src/atmosphere/UKCA/asad_flux_dat.F90@100515
[FAIL] source from location 6: /home/n02/n02/s2261584/branches_hyway/vn12.0_hyway_h2_emissions/src/atmosphere/UKCA/asad_flux_dat.F90
[FAIL] !!! source from location 7: /home/n02/n02/s2261584/branches_hyway/vn12.0_hyway_dignostics/src/atmosphere/UKCA/asad_flux_dat.F90
[FAIL] fcm make -f /home4/home/n02-puma/s2261584/cylc-run/u-dq440/work/19820101T0000Z/fcm_make_um/fcm-make.cfg -C /home/n02/n02/s2261584/cylc-run/u-dq440/share/fcm_make_um -j 32 mirror.target=ln02:cylc-run/u-dq440/share/fcm_make_um mirror.prop{config-file.name}=2 # return-code=2
2025-08-28T08:49:57Z CRITICAL - failed/EXIT
I have two branches being read in: vn12.0_hyway_h2_emissions which does not change asad_flux_dat.F90 at all, and vn12.0_hyway_dignostics which changes asad_flux_dat.F90 significantly. I had thought this would simply take the changes from the second branch but it is getting very confused. I have checked and everything is committed up to date so the local paths should not be making a difference. Changes are shown here: https://code.metoffice.gov.uk/trac/um/changeset?old_path=main%2Ftrunk%2Fsrc%2Fatmosphere%2FUKCA%2Fasad_flux_dat.F90&old=100515&new_path=%2Fmain%2Fbranches%2Fdev%2Fhannahbryant%2Fvn12.0_hyway_dignostics%2Fsrc%2Fatmosphere%2FUKCA%2Fasad_flux_dat.F90&new=
Thanks,
Hannah
