Skip to content

Actions: toastisme/dxtbx

Actions

identify merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflicts.yml
8 workflow runs
8 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Rename newsfragments/XXX.misc to newsfragments/767.misc identify merge conflicts #8: Commit 29d148a pushed by DiamondLightSource-build-server
October 23, 2024 11:11 17s beam_get_resolution_at_pixel
beam_get_resolution_at_pixel
October 23, 2024 11:11 17s
Add overloads for panel resolution methods to use beam objects instea… identify merge conflicts #7: Commit cba0239 pushed by toastisme
October 23, 2024 11:07 20s beam_get_resolution_at_pixel
beam_get_resolution_at_pixel
October 23, 2024 11:07 20s
Rename newsfragments/XXX.feature to newsfragments/764.feature identify merge conflicts #6: Commit a91151b pushed by DiamondLightSource-build-server
October 8, 2024 15:26 10s add_formatessnmx
add_formatessnmx
October 8, 2024 15:26 10s
Add FormatESSNMX to read data from the NMX detector at ESS. identify merge conflicts #5: Commit 8f4fdf8 pushed by toastisme
October 8, 2024 15:24 13s add_formatessnmx
add_formatessnmx
October 8, 2024 15:24 13s
Rename newsfragments/XXX.bugfix to newsfragments/762.bugfix identify merge conflicts #4: Commit 8efa2e8 pushed by DiamondLightSource-build-server
October 2, 2024 21:49 12s refactor_formatisissxd_detector_panels
refactor_formatisissxd_detector_panels
October 2, 2024 21:49 12s
Refactor panel positions of FormatISISSXD to account for differences … identify merge conflicts #3: Commit ce5f79e pushed by toastisme
October 2, 2024 21:45 13s refactor_formatisissxd_detector_panels
refactor_formatisissxd_detector_panels
October 2, 2024 21:45 13s
Rename newsfragments/XXX.misc to newsfragments/758.misc identify merge conflicts #2: Commit 0752d54 pushed by DiamondLightSource-build-server
September 17, 2024 15:06 15s add_expt_all_same_type
add_expt_all_same_type
September 17, 2024 15:06 15s
Add ExperimentList.all_same_type(). identify merge conflicts #1: Commit 8ce275c pushed by toastisme
September 17, 2024 14:14 17s add_expt_all_same_type
add_expt_all_same_type
September 17, 2024 14:14 17s