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

Merge branch 'main' into remove-datablock identify merge conflicts #3217: Commit 0d30762 pushed by ndevenish
August 11, 2023 14:36 14s remove-datablock
remove-datablock
August 11, 2023 14:36 14s
Update CI prebuilt version of CCTBX (#655) identify merge conflicts #3216: Commit 5e079c7 pushed by ndevenish
August 11, 2023 12:14 2m 17s main
main
August 11, 2023 12:14 2m 17s
Update CI prebuilt version of CCTBX identify merge conflicts #3215: Pull request #655 synchronize by DiamondLightSource-build-server
August 11, 2023 11:58 13s
August 11, 2023 11:58 13s
Rename newsfragments/XXX.misc to newsfragments/655.misc identify merge conflicts #3214: Commit a5370ab pushed by DiamondLightSource-build-server
August 11, 2023 11:58 11s update_ci
update_ci
August 11, 2023 11:58 11s
Update CI prebuilt version of CCTBX identify merge conflicts #3213: Commit 017ba3b pushed by ndevenish
August 11, 2023 11:57 15s update_ci
update_ci
August 11, 2023 11:57 15s
NXmx general writer identify merge conflicts #3212: Pull request #615 synchronize by ndevenish
August 11, 2023 11:33 15s
August 11, 2023 11:33 15s
Import nxmx_writer after testing for xfel identify merge conflicts #3211: Commit e999b42 pushed by ndevenish
August 11, 2023 11:33 13s nxmx_writer
nxmx_writer
August 11, 2023 11:33 13s
Add sample to source distance to Beam identify merge conflicts #3210: Pull request #622 synchronize by ndevenish
August 11, 2023 11:24 15s
August 11, 2023 11:24 15s
Add sample to source distance to Beam identify merge conflicts #3209: Pull request #622 synchronize by ndevenish
August 11, 2023 11:18 15s
August 11, 2023 11:18 15s
Add sample to source distance to Beam identify merge conflicts #3208: Pull request #622 synchronize by ndevenish
August 11, 2023 10:14 16s
August 11, 2023 10:14 16s
Add sample to source distance to Beam identify merge conflicts #3207: Pull request #622 synchronize by ndevenish
August 11, 2023 10:01 16s
August 11, 2023 10:01 16s
NXmx: handle multidimensional arrays (#612) identify merge conflicts #3206: Commit 3bc6e67 pushed by ndevenish
August 11, 2023 09:05 2m 14s main
main
August 11, 2023 09:05 2m 14s
Update 612.bugfix identify merge conflicts #3205: Commit 969c87d pushed by ndevenish
August 11, 2023 08:49 13s nxmx_moredim
nxmx_moredim
August 11, 2023 08:49 13s
NXmx: handle multidimensional arrays identify merge conflicts #3204: Pull request #612 synchronize by ndevenish
August 11, 2023 08:49 18s
August 11, 2023 08:49 18s
FormatCBFMiniEigerChessID7B2 (#649) identify merge conflicts #3203: Commit 206c7cb pushed by ndevenish
August 10, 2023 15:33 2m 20s main
main
August 10, 2023 15:33 2m 20s
ESRF ID23-2 support (#651) identify merge conflicts #3202: Commit 39c4923 pushed by ndevenish
August 10, 2023 15:32 2m 20s main
main
August 10, 2023 15:32 2m 20s
NXmx general writer identify merge conflicts #3201: Pull request #615 synchronize by phyy-nx
August 10, 2023 15:17 14s
August 10, 2023 15:17 14s
Skip tests if dials/xfel not there identify merge conflicts #3200: Commit 20d6a3f pushed by phyy-nx
August 10, 2023 15:17 20s nxmx_writer
nxmx_writer
August 10, 2023 15:17 20s
NXmx general writer identify merge conflicts #3199: Pull request #615 synchronize by ndevenish
August 10, 2023 15:10 16s
August 10, 2023 15:10 16s
Merge branch 'main' into nxmx_writer identify merge conflicts #3198: Commit 13c7d3b pushed by ndevenish
August 10, 2023 15:10 14s nxmx_writer
nxmx_writer
August 10, 2023 15:10 14s
NXmx: handle multidimensional arrays identify merge conflicts #3197: Pull request #612 synchronize by ndevenish
August 10, 2023 15:07 15s
August 10, 2023 15:07 15s
Merge remote-tracking branch 'origin/main' into nxmx_moredim identify merge conflicts #3196: Commit c3c4a26 pushed by ndevenish
August 10, 2023 15:07 16s nxmx_moredim
nxmx_moredim
August 10, 2023 15:07 16s
FormatCBFMiniEigerChessID7B2 identify merge conflicts #3195: Pull request #649 synchronize by ndevenish
August 10, 2023 15:01 18s
August 10, 2023 15:01 18s
Update 651.feature identify merge conflicts #3194: Commit c70f099 pushed by ndevenish
August 10, 2023 14:58 21s esrf-id23-2
esrf-id23-2
August 10, 2023 14:58 21s
ESRF ID23-2 support identify merge conflicts #3193: Pull request #651 synchronize by ndevenish
August 10, 2023 14:58 21s
August 10, 2023 14:58 21s
ProTip! You can narrow down the results and go further in time using created:<2023-08-10 or the other filters available.