Skip to content

Actions: cctbx/dxtbx

Actions

identify merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Rename newsfragments/XXX.bugfix to newsfragments/660.bugfix identify merge conflicts #3267: Commit 29a617c pushed by DiamondLightSource-build-server
September 7, 2023 15:30 13s cbf_writer_raw_data
cbf_writer_raw_data
September 7, 2023 15:30 13s
Use raw data instead of corrected data for cbf_writer identify merge conflicts #3266: Pull request #660 synchronize by phyy-nx
September 7, 2023 15:30 18s
September 7, 2023 15:30 18s
News identify merge conflicts #3265: Commit 6a783d4 pushed by phyy-nx
September 7, 2023 15:29 17s cbf_writer_raw_data
cbf_writer_raw_data
September 7, 2023 15:29 17s
Use raw data instead of corrected data for cbf_writer identify merge conflicts #3264: Pull request #660 synchronize by dermen
September 6, 2023 21:34 18s
September 6, 2023 21:34 18s
missing encode call identify merge conflicts #3263: Commit ec61517 pushed by dermen
September 6, 2023 21:34 13s cbf_writer_raw_data
cbf_writer_raw_data
September 6, 2023 21:34 13s
Use raw data instead of corrected data for cbf_writer identify merge conflicts #3262: Commit c4bffba pushed by phyy-nx
September 6, 2023 21:13 20s cbf_writer_raw_data
cbf_writer_raw_data
September 6, 2023 21:13 20s
DIALS 3.16.1 Changelog identify merge conflicts #3261: Commit 593c0ef pushed by DiamondLightSource-build-server
September 6, 2023 07:56 2m 18s main
main
September 6, 2023 07:56 2m 18s
identify merge conflicts identify merge conflicts #3260: by DiamondLightSource-build-server
September 6, 2023 07:55 14s v3.16.1
v3.16.1
September 6, 2023 07:55 14s
Add format class to understand Jungfrau4M serial data from ID29, ESRF identify merge conflicts #3259: Pull request #659 synchronize by DiamondLightSource-build-server
September 1, 2023 12:31 14s
September 1, 2023 12:31 14s
Rename newsfragments/XXX.feature to newsfragments/659.feature identify merge conflicts #3258: Commit e7dd338 pushed by DiamondLightSource-build-server
September 1, 2023 12:31 14s ESRF_SMX
ESRF_SMX
September 1, 2023 12:31 14s
Add format class to understand Jungfrau4M serial data from ID29, ESRF identify merge conflicts #3257: Commit 7d4f95b pushed by jbeilstenedmands
September 1, 2023 12:29 16s ESRF_SMX
ESRF_SMX
September 1, 2023 12:29 16s
Fix pkg_resources->importlib performance regression (#658) identify merge conflicts #3256: Commit 2fc8ffa pushed by ndevenish
August 24, 2023 09:20 2m 13s main
main
August 24, 2023 09:20 2m 13s
Fix slowness of loading large experiment lists due to pkg_resources->importlib change identify merge conflicts #3255: Pull request #658 synchronize by ndevenish
August 24, 2023 09:18 19s
August 24, 2023 09:18 19s
Update 658.bugfix identify merge conflicts #3254: Commit 33fe178 pushed by ndevenish
August 24, 2023 09:18 18s fix_importlib_slowness
fix_importlib_slowness
August 24, 2023 09:18 18s
Break the DIALS/xfel circular dependency identify merge conflicts #3253: Pull request #627 synchronize by phyy-nx
August 23, 2023 16:31 16s
August 23, 2023 16:31 16s
Remove xfel reference that snuck in with nxmx_writer identify merge conflicts #3252: Commit 0ea8689 pushed by phyy-nx
August 23, 2023 16:31 19s serial_tbx
serial_tbx
August 23, 2023 16:31 19s
Fix slowness of loading large experiment lists due to pkg_resources->importlib change identify merge conflicts #3251: Pull request #658 synchronize by jbeilstenedmands
August 22, 2023 10:37 14s
August 22, 2023 10:37 14s
Account for when entry points not registered identify merge conflicts #3250: Commit eefccb2 pushed by jbeilstenedmands
August 22, 2023 10:37 16s fix_importlib_slowness
fix_importlib_slowness
August 22, 2023 10:37 16s
Fix slowness of loading large experiment lists due to pkg_resources->importlib change identify merge conflicts #3249: Pull request #658 synchronize by DiamondLightSource-build-server
August 22, 2023 10:07 14s
August 22, 2023 10:07 14s
Rename newsfragments/XXX.bugfix to newsfragments/658.bugfix identify merge conflicts #3248: Commit f8c6fd0 pushed by DiamondLightSource-build-server
August 22, 2023 10:07 13s fix_importlib_slowness
fix_importlib_slowness
August 22, 2023 10:07 13s
Fix slowness of loading large experiment lists due to pkg_resources->… identify merge conflicts #3247: Commit 7d236a6 pushed by jbeilstenedmands
August 22, 2023 10:03 16s fix_importlib_slowness
fix_importlib_slowness
August 22, 2023 10:03 16s
Break the DIALS/xfel circular dependency identify merge conflicts #3246: Pull request #627 synchronize by phyy-nx
August 21, 2023 21:16 13s
August 21, 2023 21:16 13s
Fix leftover conflict identify merge conflicts #3245: Commit 63e5ebe pushed by phyy-nx
August 21, 2023 21:16 15s serial_tbx
serial_tbx
August 21, 2023 21:16 15s
Add properties table to Scan identify merge conflicts #3244: Pull request #620 synchronize by toastisme
August 21, 2023 09:07 14s
August 21, 2023 09:07 14s
Add properties table to Scan identify merge conflicts #3243: Pull request #620 synchronize by toastisme
August 17, 2023 23:38 15s
August 17, 2023 23:38 15s
ProTip! You can narrow down the results and go further in time using created:<2023-08-17 or the other filters available.