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

Switch dxtbx to unified dependency system identify merge conflicts #3617: Pull request #753 synchronize by ndevenish
August 20, 2024 14:03 17s
August 20, 2024 14:03 17s
Switch dxtbx to unified dependency system identify merge conflicts #3616: Pull request #753 synchronize by ndevenish
August 20, 2024 13:51 10s
August 20, 2024 13:51 10s
Switch dxtbx to unified dependency system identify merge conflicts #3615: Pull request #753 synchronize by ndevenish
August 20, 2024 13:47 14s
August 20, 2024 13:47 14s
Switch dxtbx to unified dependency system identify merge conflicts #3614: Pull request #753 synchronize by ndevenish
August 20, 2024 13:42 12s
August 20, 2024 13:42 12s
Switch dxtbx to unified dependency system identify merge conflicts #3613: Pull request #753 synchronize by ndevenish
August 20, 2024 13:39 18s
August 20, 2024 13:39 18s
Bump version: 3.21.dev → 3.22.dev identify merge conflicts #3612: Commit 629e4f9 pushed by ndevenish
August 20, 2024 12:58 2m 15s main
main
August 20, 2024 12:58 2m 15s
Bump version: 3.21.dev → 3.21.0 identify merge conflicts #3611: Commit d297cf3 pushed by DiamondLightSource-build-server
August 20, 2024 12:41 11s v3.21.0
v3.21.0
August 20, 2024 12:41 11s
Bump version: 3.21.dev → 3.21.0 identify merge conflicts #3610: Commit d297cf3 pushed by DiamondLightSource-build-server
August 20, 2024 12:41 15s dials-3.21
dials-3.21
August 20, 2024 12:41 15s
FullCBFWriter: repair the panel shuffling bug (#745) identify merge conflicts #3609: Pull request #752 synchronize by DiamondLightSource-build-server
August 20, 2024 12:41 14s
August 20, 2024 12:41 14s
Rename newsfragments/XXX.bugfix to newsfragments/752.bugfix identify merge conflicts #3608: Commit 5354de1 pushed by DiamondLightSource-build-server
August 20, 2024 12:41 11s fullcbfwriter-order-fix
fullcbfwriter-order-fix
August 20, 2024 12:41 11s
Add newsfragment identify merge conflicts #3607: Commit 5d5397b pushed by biochem-fan
August 20, 2024 12:38 14s fullcbfwriter-order-fix
fullcbfwriter-order-fix
August 20, 2024 12:38 14s
Tweaks identify merge conflicts #3606: Commit 4cc2835 pushed by ndevenish
August 19, 2024 11:33 13s dials-tweaks-3.21
dials-tweaks-3.21
August 19, 2024 11:33 13s
Merge branch 'main' into general-timepix-format identify merge conflicts #3605: Commit 466004b pushed by ndevenish
August 16, 2024 13:37 15s general-timepix-format
general-timepix-format
August 16, 2024 13:37 15s
General Timepix3 LATRD format identify merge conflicts #3604: Pull request #305 synchronize by ndevenish
August 16, 2024 13:37 12s
August 16, 2024 13:37 12s
Extra checks for reading pickle-Format files (#744) identify merge conflicts #3603: Commit 38c95db pushed by ndevenish
August 16, 2024 13:22 2m 9s main
main
August 16, 2024 13:22 2m 9s
Add Nonius Kappa CCD format module (#741) identify merge conflicts #3602: Commit 6c83b6e pushed by ndevenish
August 16, 2024 13:19 2m 10s main
main
August 16, 2024 13:19 2m 10s
Extra checks for reading pickle files identify merge conflicts #3601: Pull request #744 synchronize by ndevenish
August 16, 2024 13:17 10s
August 16, 2024 13:17 10s
Merge branch 'main' into formatpy_fix identify merge conflicts #3600: Commit 6207d17 pushed by ndevenish
August 16, 2024 13:17 12s formatpy_fix
formatpy_fix
August 16, 2024 13:17 12s
FormatSMVRigakuSaturnNoTS pedestal fix (#746) identify merge conflicts #3599: Commit 74fd1f1 pushed by dagewa
August 16, 2024 13:13 2m 15s main
main
August 16, 2024 13:13 2m 15s
Flumpy: Suppress a pybind11 warning on recent compilers (#748) identify merge conflicts #3598: Commit 3a42086 pushed by ndevenish
August 16, 2024 12:57 2m 12s main
main
August 16, 2024 12:57 2m 12s
MNT: Update merge conflict labelling action identify merge conflicts #3597: Commit 0a0a2cb pushed by ndevenish
August 16, 2024 12:51 2m 15s main
main
August 16, 2024 12:51 2m 15s
Update merge conflict labelling action identify merge conflicts #3596: Commit 8a4a846 pushed by ndevenish
August 16, 2024 12:50 10s update_workflow
update_workflow
August 16, 2024 12:50 10s
FormatSMVRigakuSaturnNoTS pedestal fix identify merge conflicts #3595: Pull request #746 synchronize by ndevenish
August 16, 2024 12:43 10s
August 16, 2024 12:43 10s
Merge branch 'main' into FormatSMVRigakuSaturnNoTS-fix identify merge conflicts #3594: Commit 3f61b11 pushed by ndevenish
August 16, 2024 12:43 11s FormatSMVRigakuSaturnNoTS-fix
FormatSMVRigakuSaturnNoTS-fix
August 16, 2024 12:43 11s
Additional methods for FormatISISSXD identify merge conflicts #3593: Pull request #747 synchronize by ndevenish
August 16, 2024 12:40 14s
August 16, 2024 12:40 14s