Skip to content

Actions: dials/dxtbx

Actions

identify merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflicts.yml
353 workflow runs
353 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Update 633.bugfix identify merge conflicts #1283: Commit 5b8afaf pushed by ndevenish
July 26, 2023 10:37 14s 633-imageset-slicing
633-imageset-slicing
July 26, 2023 10:37 14s
Rename newsfragments/xxx.feature to newsfragments/649.feature identify merge conflicts #1282: Commit 471c394 pushed by DiamondLightSource-build-server
July 26, 2023 08:41 12s CHESS-ID7B2-inverted-axis
CHESS-ID7B2-inverted-axis
July 26, 2023 08:41 12s
News identify merge conflicts #1281: Commit bc47fdd pushed by dagewa
July 26, 2023 08:34 14s CHESS-ID7B2-inverted-axis
CHESS-ID7B2-inverted-axis
July 26, 2023 08:34 14s
Flumpy: Don't allow converting 1D vectors to vec2/3 (#648) identify merge conflicts #1280: Commit 436a1b6 pushed by DiamondLightSource-build-server
July 25, 2023 17:42 14s main
main
July 25, 2023 17:42 14s
Easier override of panel geometry (#644) identify merge conflicts #1279: Commit 930be09 pushed by DiamondLightSource-build-server
July 25, 2023 08:55 15s main
main
July 25, 2023 08:55 15s
Rename newsfragments/xxx.feature to newsfragments/647.feature identify merge conflicts #1278: Commit 823b075 pushed by DiamondLightSource-build-server
July 24, 2023 15:32 14s 575-beam-model-should-state-probe-type
575-beam-model-should-state-probe-type
July 24, 2023 15:32 14s
News identify merge conflicts #1277: Commit 9f2400a pushed by dagewa
July 24, 2023 15:25 15s 575-beam-model-should-state-probe-type
575-beam-model-should-state-probe-type
July 24, 2023 15:25 15s
Add note about Rigaku non-zero-padded image templates, which cause identify merge conflicts #1276: Commit 6e5e303 pushed by dagewa
July 20, 2023 11:49 11s FormatROD
FormatROD
July 20, 2023 11:49 11s
bugfix identify merge conflicts #1275: Commit cf07f9f pushed by dagewa
July 20, 2023 09:32 13s FormatROD
FormatROD
July 20, 2023 09:32 13s
Rename newsfragments/xxx.feature to newsfragments/645.feature identify merge conflicts #1274: Commit 1bd01c8 pushed by DiamondLightSource-build-server
July 20, 2023 08:56 13s FormatROD
FormatROD
July 20, 2023 08:56 13s
News identify merge conflicts #1273: Commit 3103b32 pushed by dagewa
July 20, 2023 08:48 15s FormatROD
FormatROD
July 20, 2023 08:48 15s
Merge branch 'main' into 633-imageset-slicing identify merge conflicts #1272: Commit da0926e pushed by dagewa
July 19, 2023 12:36 14s 633-imageset-slicing
633-imageset-slicing
July 19, 2023 12:36 14s
News identify merge conflicts #1271: Commit cc95e92 pushed by dagewa
July 6, 2023 11:54 13s 299-trying-to-override-panel-geometry-fails
299-trying-to-override-panel-geometry-fails
July 6, 2023 11:54 13s
Drop Python 3.8 support (#642) identify merge conflicts #1270: Commit 1625cfa pushed by DiamondLightSource-build-server
June 30, 2023 08:42 14s main
main
June 30, 2023 08:42 14s
Use importlib instead of pkg_resources (#643) identify merge conflicts #1269: Commit 71d4ec0 pushed by DiamondLightSource-build-server
June 29, 2023 21:24 12s main
main
June 29, 2023 21:24 12s
DIALS 3.15.1 Changelog identify merge conflicts #1268: Commit 6c6d665 pushed by DiamondLightSource-build-server
June 29, 2023 19:25 14s main
main
June 29, 2023 19:25 14s
DIALS 3.15.1 identify merge conflicts #1267: Commit 40f1c9b pushed by DiamondLightSource-build-server
June 29, 2023 19:23 13s v3.15.1
v3.15.1
June 29, 2023 19:23 13s
Towncrier for 3.15.1 identify merge conflicts #1266: Commit 1cae1c0 pushed by DiamondLightSource-build-server
June 29, 2023 19:23 13s dials-next
dials-next
June 29, 2023 19:23 13s
DIALS 3.15.1 identify merge conflicts #1265: Commit 40f1c9b pushed by DiamondLightSource-build-server
June 29, 2023 19:23 13s dials-3.15
dials-3.15
June 29, 2023 19:23 13s
DIALS 3.15.1 identify merge conflicts #1264: Commit 40f1c9b pushed by DiamondLightSource-build-server
June 29, 2023 08:44 14s dials-3.15rc
dials-3.15rc
June 29, 2023 08:44 14s
DIALS 3.15.1 identify merge conflicts #1263: Commit 96d66ba pushed by DiamondLightSource-build-server
June 28, 2023 03:39 14s dials-3.15rc
dials-3.15rc
June 28, 2023 03:39 14s
DIALS 3.15.1 identify merge conflicts #1262: Commit 6071331 pushed by DiamondLightSource-build-server
June 27, 2023 13:24 12s dials-3.15rc
dials-3.15rc
June 27, 2023 13:24 12s
DIALS 3.15.1 identify merge conflicts #1261: Pull request #182 synchronize by ndevenish
June 27, 2023 13:22 12s
June 27, 2023 13:22 12s
MNT: Skip tests removed from DLS filesystem identify merge conflicts #1260: Commit fc6eb43 pushed by ndevenish
June 27, 2023 13:22 12s dials-next
dials-next
June 27, 2023 13:22 12s
MNT: Skip tests removed from DLS filesystem identify merge conflicts #1259: Commit 133ca8e pushed by DiamondLightSource-build-server
June 27, 2023 13:22 12s main
main
June 27, 2023 13:22 12s
ProTip! You can narrow down the results and go further in time using created:<2023-06-27 or the other filters available.