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.feature to newsfragments/651.feature identify merge conflicts #3167: Commit 66efd56 pushed by DiamondLightSource-build-server
July 27, 2023 14:03 17s esrf-id23-2
esrf-id23-2
July 27, 2023 14:03 17s
ESRF ID23-2 identify merge conflicts #3166: Commit f09f437 pushed by graeme-winter
July 27, 2023 14:02 14s esrf-id23-2
esrf-id23-2
July 27, 2023 14:02 14s
MNT: Update CMake modules path relative to script identify merge conflicts #3165: Commit 0a068b5 pushed by ndevenish
July 27, 2023 13:52 2m 17s main
main
July 27, 2023 13:52 2m 17s
NXmx general writer identify merge conflicts #3164: Pull request #615 synchronize by phyy-nx
July 26, 2023 16:06 15s
July 26, 2023 16:06 15s
Add ad hoc attempt at allow storage of multiple crystal models when w… identify merge conflicts #3163: Commit e132f70 pushed by phyy-nx
July 26, 2023 16:06 15s nxmx_writer
nxmx_writer
July 26, 2023 16:06 15s
Make Imageset slices consistently index from 0 identify merge conflicts #3162: Commit 69169ff pushed by ndevenish
July 26, 2023 15:58 2m 14s main
main
July 26, 2023 15:58 2m 14s
Fixes for EMBL beamlines at PETRA identify merge conflicts #3161: Pull request #626 synchronize by DiamondLightSource-build-server
July 26, 2023 15:39 16s
July 26, 2023 15:39 16s
Fixes for EMBL beamlines at PETRA identify merge conflicts #3160: Pull request #626 synchronize by ndevenish
July 26, 2023 15:39 16s
July 26, 2023 15:39 16s
Fixes for EMBL beamlines at PETRA identify merge conflicts #3159: Pull request #626 synchronize by ndevenish
July 26, 2023 15:38 20s
July 26, 2023 15:38 20s
Fixes for EMBL beamlines at PETRA identify merge conflicts #3158: Pull request #626 synchronize by ndevenish
July 26, 2023 15:36 19s
July 26, 2023 15:36 19s
Check Registry against refl/expt files (#650) identify merge conflicts #3157: Commit e9b88d2 pushed by ndevenish
July 26, 2023 13:42 2m 20s main
main
July 26, 2023 13:42 2m 20s
Check Registry against refl/expt files identify merge conflicts #3156: Pull request #650 synchronize by DiamondLightSource-build-server
July 26, 2023 13:25 13s
July 26, 2023 13:25 13s
Imageset slicing identify merge conflicts #3155: Pull request #634 synchronize by dagewa
July 26, 2023 13:18 2m 18s
July 26, 2023 13:18 2m 18s
FormatROD (#645) identify merge conflicts #3154: Commit 180fac8 pushed by dagewa
July 26, 2023 13:18 2m 19s main
main
July 26, 2023 13:18 2m 19s
FormatROD identify merge conflicts #3153: Pull request #645 synchronize by ndevenish
July 26, 2023 11:47 18s
July 26, 2023 11:47 18s
FormatCBFMiniEigerChessID7B2 identify merge conflicts #3152: Pull request #649 synchronize by DiamondLightSource-build-server
July 26, 2023 08:41 14s
July 26, 2023 08:41 14s
Flumpy: Don't allow converting 1D vectors to vec2/3 (#648) identify merge conflicts #3151: Commit 436a1b6 pushed by ndevenish
July 25, 2023 17:42 2m 15s main
main
July 25, 2023 17:42 2m 15s
Remove datablock identify merge conflicts #3150: Pull request #570 synchronize by dagewa
July 25, 2023 09:21 15s
July 25, 2023 09:21 15s
Merge branch 'main' into remove-datablock identify merge conflicts #3149: Commit 004a99e pushed by dagewa
July 25, 2023 09:21 18s remove-datablock
remove-datablock
July 25, 2023 09:21 18s
Easier override of panel geometry (#644) identify merge conflicts #3148: Commit 930be09 pushed by dagewa
July 25, 2023 08:54 2m 18s main
main
July 25, 2023 08:54 2m 18s
Add probe type to the Beam model identify merge conflicts #3147: Pull request #647 synchronize by DiamondLightSource-build-server
July 24, 2023 15:33 19s
July 24, 2023 15:33 19s
Drop Python 3.8 support (#642) identify merge conflicts #3146: Commit 1625cfa pushed by dagewa
July 21, 2023 14:31 20s 575-beam-model-should-state-probe-type
575-beam-model-should-state-probe-type
July 21, 2023 14:31 20s
FormatROD identify merge conflicts #3145: Pull request #645 synchronize by dagewa
July 20, 2023 11:49 14s
July 20, 2023 11:49 14s
FormatROD identify merge conflicts #3144: Pull request #645 synchronize by dagewa
July 20, 2023 09:32 19s
July 20, 2023 09:32 19s
FormatROD identify merge conflicts #3143: Pull request #645 synchronize by DiamondLightSource-build-server
July 20, 2023 08:56 17s
July 20, 2023 08:56 17s
ProTip! You can narrow down the results and go further in time using created:<2023-07-20 or the other filters available.