Skip to content
identify merge conflicts

Rename newsfragments/XXX.bugfix to newsfragments/2729.bugfix #322

Sign in to view logs

Rename newsfragments/XXX.bugfix to newsfragments/2729.bugfix

Rename newsfragments/XXX.bugfix to newsfragments/2729.bugfix #322

Triggered via push August 27, 2024 12:58
@DiamondLightSource-build-serverDiamondLightSource-build-server
pushed d2b6696
radial_profile_tof_fix
Status Success
Total duration 11s
Artifacts –

merge-conflicts.yml

on: push
label
2s
label
Fit to window
Zoom out
Zoom in

Annotations

2 warnings
label
The following actions uses node12 which is deprecated and will be forced to run on node16: eps1lon/actions-label-merge-conflict@72a2cf9eb9640428abbd99bc0aa6dd522073b9d3. For more info: https://github.blog/changelog/2023-06-13-github-actions-all-actions-will-run-on-node16-instead-of-node12-by-default/
label
The following actions use a deprecated Node.js version and will be forced to run on node20: eps1lon/actions-label-merge-conflict@72a2cf9eb9640428abbd99bc0aa6dd522073b9d3. For more info: https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/