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

WIP adding the inverted pilatus from SPring-8 identify merge conflicts #3192: Commit 12f0a00 pushed by ndevenish
August 10, 2023 12:47 15s cbf_inverted_pilatus
cbf_inverted_pilatus
August 10, 2023 12:47 15s
Fix bit depth for Eiger / NXmx for i19-2 (#652) identify merge conflicts #3191: Commit d516f20 pushed by graeme-winter
August 8, 2023 13:09 2m 14s main
main
August 8, 2023 13:09 2m 14s
Add probe type to the Beam model (#647) identify merge conflicts #3190: Commit 4783b2c pushed by ndevenish
August 4, 2023 15:48 2m 16s main
main
August 4, 2023 15:48 2m 16s
Add probe type to the Beam model identify merge conflicts #3189: Pull request #647 synchronize by dagewa
August 4, 2023 13:27 15s
August 4, 2023 13:27 15s
Add probe type to the Beam model identify merge conflicts #3188: Pull request #647 synchronize by dagewa
August 4, 2023 13:27 2m 18s
August 4, 2023 13:27 2m 18s
NXmx general writer identify merge conflicts #3187: Pull request #615 synchronize by phyy-nx
August 4, 2023 00:32 18s
August 4, 2023 00:32 18s
Bugfix (missing parentheses) identify merge conflicts #3186: Commit 35cc9fa pushed by phyy-nx
August 4, 2023 00:32 19s nxmx_writer
nxmx_writer
August 4, 2023 00:32 19s
FormatROD - Multi-axis goniometer, faster decompression (#653) identify merge conflicts #3185: Commit 5c27616 pushed by ndevenish
August 3, 2023 16:02 2m 23s main
main
August 3, 2023 16:02 2m 23s
Merge pull request #653 from dials/FormatROD-multiaxis identify merge conflicts #3184: Commit e91a6f5 pushed by dagewa
August 3, 2023 15:53 2m 15s main
main
August 3, 2023 15:53 2m 15s
Add probe type to the Beam model identify merge conflicts #3183: Pull request #647 synchronize by dagewa
August 3, 2023 15:35 23s
August 3, 2023 15:35 23s
Merge pull request #654 from toastisme/beam-probe-types identify merge conflicts #3182: Commit 35a312c pushed by dagewa
August 3, 2023 15:24 18s 575-beam-model-should-state-probe-type
575-beam-model-should-state-probe-type
August 3, 2023 15:24 18s
FormatROD - multi-axis goniometer and faster decompression #186 identify merge conflicts #3181: Pull request #653 synchronize by dagewa
August 3, 2023 08:43 20s
August 3, 2023 08:43 20s
Add probe type to the Beam model identify merge conflicts #3180: Pull request #647 synchronize by dagewa
August 2, 2023 16:43 19s
August 2, 2023 16:43 19s
Add probe type to the Beam model identify merge conflicts #3179: Pull request #647 synchronize by dagewa
August 2, 2023 16:14 18s
August 2, 2023 16:14 18s
Add probe type to the Beam model identify merge conflicts #3178: Pull request #647 synchronize by dagewa
August 2, 2023 15:36 16s
August 2, 2023 15:36 16s
Add polychromatic beam (#621) identify merge conflicts #3177: Commit ef5f9ab pushed by toastisme
August 2, 2023 13:15 2m 19s main
main
August 2, 2023 13:15 2m 19s
FormatROD - multi-axis goniometer and faster decompression #186 identify merge conflicts #3176: Pull request #653 synchronize by biochem-fan
August 2, 2023 09:19 21s
August 2, 2023 09:19 21s
FormatROD - multi-axis goniometer and faster decompression #186 identify merge conflicts #3175: Pull request #653 synchronize by biochem-fan
August 2, 2023 09:07 14s
August 2, 2023 09:07 14s
FormatROD - multi-axis goniometer and faster decompression #186 identify merge conflicts #3174: Pull request #653 synchronize by DiamondLightSource-build-server
August 2, 2023 09:04 19s
August 2, 2023 09:04 19s
Fixes for EMBL beamlines at PETRA (#626) identify merge conflicts #3173: Commit 64bcb32 pushed by ndevenish
July 31, 2023 08:58 2m 16s main
main
July 31, 2023 08:58 2m 16s
FormatCBFMiniEigerChessID7B2 identify merge conflicts #3172: Pull request #649 synchronize by dagewa
July 28, 2023 13:38 20s
July 28, 2023 13:38 20s
Fix bit depth for Eiger / NXmx for i19-2 identify merge conflicts #3171: Pull request #652 synchronize by DiamondLightSource-build-server
July 28, 2023 11:49 14s
July 28, 2023 11:49 14s
Rename newsfragments/XXX.bugfix to newsfragments/652.bugfix identify merge conflicts #3170: Commit 14ffd9b pushed by DiamondLightSource-build-server
July 28, 2023 11:49 13s bit-depth-i19-2
bit-depth-i19-2
July 28, 2023 11:49 13s
Fix bit depth for Eiger . NXmx for i19-2 identify merge conflicts #3169: Commit 06a89e8 pushed by graeme-winter
July 28, 2023 11:49 18s bit-depth-i19-2
bit-depth-i19-2
July 28, 2023 11:49 18s
ESRF ID23-2 support identify merge conflicts #3168: Pull request #651 synchronize by DiamondLightSource-build-server
July 27, 2023 14:03 16s
July 27, 2023 14:03 16s
ProTip! You can narrow down the results and go further in time using created:<2023-07-27 or the other filters available.