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

Allow ToF experiments to share models. identify merge conflicts #3517: Pull request #721 synchronize by toastisme
April 26, 2024 13:23 16s
April 26, 2024 13:23 16s
Add experiment type (#702) identify merge conflicts #3516: Commit 6fcf993 pushed by toastisme
April 24, 2024 14:06 6m 30s main
main
April 24, 2024 14:06 6m 30s
Add experiment type identify merge conflicts #3515: Pull request #702 synchronize by toastisme
April 24, 2024 13:42 2m 20s
April 24, 2024 13:42 2m 20s
Add experiment type identify merge conflicts #3514: Pull request #702 synchronize by toastisme
April 24, 2024 10:47 10m 29s
April 24, 2024 10:47 10m 29s
Add experiment type identify merge conflicts #3513: Pull request #702 synchronize by toastisme
April 24, 2024 10:10 18s
April 24, 2024 10:10 18s
Clean Clutter identify merge conflicts #3512: Commit ee74a3d pushed by DiamondLightSource-build-server
April 24, 2024 07:47 2m 12s main
main
April 24, 2024 07:47 2m 12s
FormatROD set beam probe to electron for ED identify merge conflicts #3511: Pull request #728 synchronize by DiamondLightSource-build-server
April 23, 2024 12:30 17s
April 23, 2024 12:30 17s
Fix profile, scaling models in Python 3.12 (#727) identify merge conflicts #3510: Commit e357acc pushed by ndevenish
April 23, 2024 09:28 2m 15s main
main
April 23, 2024 09:28 2m 15s
Fix profile, scaling models in Python 3.12 identify merge conflicts #3509: Pull request #727 synchronize by DiamondLightSource-build-server
April 23, 2024 09:05 16s
April 23, 2024 09:05 16s
Fix profile model silent failure in Python 3.12 identify merge conflicts #3508: Commit aa33ddc pushed by ndevenish
April 23, 2024 08:49 14s python3.12
python3.12
April 23, 2024 08:49 14s
Remove XPASS on "Imageset slicing consistency" test (#726) identify merge conflicts #3507: Commit ece63b8 pushed by ndevenish
April 23, 2024 08:32 2m 16s main
main
April 23, 2024 08:32 2m 16s
Python 3.12 Compatibility (#725) identify merge conflicts #3506: Commit e0c47b6 pushed by ndevenish
April 23, 2024 08:17 2m 15s main
main
April 23, 2024 08:17 2m 15s
Remove XPASS on "Imageset slicing consistency" test identify merge conflicts #3505: Pull request #726 synchronize by DiamondLightSource-build-server
April 23, 2024 08:09 17s
April 23, 2024 08:09 17s
Python 3.12 Compatibility identify merge conflicts #3504: Pull request #725 synchronize by ndevenish
April 23, 2024 07:53 16s
April 23, 2024 07:53 16s
Fix python 3.9 syntax for entry_points identify merge conflicts #3503: Commit 990b49b pushed by ndevenish
April 23, 2024 07:53 15s python3.12
python3.12
April 23, 2024 07:53 15s
Python 3.12 Compatibility identify merge conflicts #3502: Pull request #725 synchronize by ndevenish
April 22, 2024 15:49 16s
April 22, 2024 15:49 16s
Rename pipeline identify merge conflicts #3501: Commit cdfa2bf pushed by ndevenish
April 22, 2024 15:49 14s python3.12
python3.12
April 22, 2024 15:49 14s
Python 3.12 Compatibility identify merge conflicts #3500: Pull request #725 synchronize by ndevenish
April 22, 2024 15:47 17s
April 22, 2024 15:47 17s
Bump identify merge conflicts #3499: Commit a8d1836 pushed by ndevenish
April 22, 2024 15:47 14s python3.12
python3.12
April 22, 2024 15:47 14s
Python 3.12 Compatibility identify merge conflicts #3498: Pull request #725 synchronize by ndevenish
April 22, 2024 15:35 15s
April 22, 2024 15:35 15s
Bump identify merge conflicts #3497: Commit e7c9ece pushed by ndevenish
April 22, 2024 15:35 14s python3.12
python3.12
April 22, 2024 15:35 14s
Clean Clutter identify merge conflicts #3496: Commit 3c8888d pushed by DiamondLightSource-build-server
April 21, 2024 04:10 12s tmp_1L8rA
tmp_1L8rA
April 21, 2024 04:10 12s
Remove dials dependency from FormatSMVTimePix (#724) identify merge conflicts #3495: Commit 884de37 pushed by ndevenish
April 19, 2024 17:07 2m 13s main
main
April 19, 2024 17:07 2m 13s
Enable Python 3.12 on CI testing identify merge conflicts #3494: Commit 68f66b7 pushed by ndevenish
April 19, 2024 16:51 14s python3.12
python3.12
April 19, 2024 16:51 14s
Revert "Account for cctbx environment changes in python 3.12" identify merge conflicts #3493: Commit 2e14e4b pushed by ndevenish
April 19, 2024 16:51 16s python3.12
python3.12
April 19, 2024 16:51 16s