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

DIALS 3.17.1 identify merge conflicts #1433: Commit fd48b09 pushed by DiamondLightSource-build-server
February 12, 2024 04:57 9s dials-3.17rc
dials-3.17rc
February 12, 2024 04:57 9s
DIALS 3.17.1 identify merge conflicts #1432: Commit 9abd068 pushed by DiamondLightSource-build-server
February 7, 2024 09:15 10s dials-3.17rc
dials-3.17rc
February 7, 2024 09:15 10s
New file writer image dimensions (#676) identify merge conflicts #1431: Commit 03e7ee0 pushed by DiamondLightSource-build-server
February 5, 2024 10:05 16s main
main
February 5, 2024 10:05 16s
DIALS 3.17.1 identify merge conflicts #1430: Commit a632a7a pushed by DiamondLightSource-build-server
February 5, 2024 04:57 14s dials-3.17rc
dials-3.17rc
February 5, 2024 04:57 14s
DIALS 3.17.1 identify merge conflicts #1429: Commit 4093412 pushed by DiamondLightSource-build-server
January 29, 2024 04:57 10s dials-3.17rc
dials-3.17rc
January 29, 2024 04:57 10s
FormatSMVTimePix_SU mask out central cross of virtual pixels (#683) identify merge conflicts #1428: Commit 3e5ac9b pushed by DiamondLightSource-build-server
January 26, 2024 11:29 10s main
main
January 26, 2024 11:29 10s
Formats for the ELDICO ED-1 (#682) identify merge conflicts #1427: Commit 33a7202 pushed by DiamondLightSource-build-server
January 26, 2024 11:28 14s main
main
January 26, 2024 11:28 14s
Rename newsfragments/xxx.feature to newsfragments/683.feature identify merge conflicts #1426: Commit daf65ea pushed by DiamondLightSource-build-server
January 23, 2024 14:36 12s FormatSMVTimePix_SU-mask
FormatSMVTimePix_SU-mask
January 23, 2024 14:36 12s
News identify merge conflicts #1425: Commit 3b99d51 pushed by dagewa
January 23, 2024 14:24 14s FormatSMVTimePix_SU-mask
FormatSMVTimePix_SU-mask
January 23, 2024 14:24 14s
Rename newsfragments/xxx.feature to newsfragments/682.feature identify merge conflicts #1424: Commit a557185 pushed by DiamondLightSource-build-server
January 22, 2024 10:01 12s ED-1-formats
ED-1-formats
January 22, 2024 10:01 12s
News identify merge conflicts #1423: Commit f7dd150 pushed by dagewa
January 22, 2024 09:39 11s ED-1-formats
ED-1-formats
January 22, 2024 09:39 11s
DIALS 3.17.1 identify merge conflicts #1422: Commit 859bb02 pushed by DiamondLightSource-build-server
January 22, 2024 04:57 13s dials-3.17rc
dials-3.17rc
January 22, 2024 04:57 13s
Add spectrum_required=False to FormatXTC (#674) identify merge conflicts #1421: Commit 5179420 pushed by DiamondLightSource-build-server
January 19, 2024 00:40 12s main
main
January 19, 2024 00:40 12s
FormatMRC: more robust handling of extended headers. (#679) identify merge conflicts #1420: Commit f903a3c pushed by DiamondLightSource-build-server
January 18, 2024 16:07 16s main
main
January 18, 2024 16:07 16s
Bump version: 3.18.dev → 3.19.dev identify merge conflicts #1419: Commit 5a8757e pushed by DiamondLightSource-build-server
January 15, 2024 12:09 14s dials-3.18rc-main
dials-3.18rc-main
January 15, 2024 12:09 14s
Bump version: 3.18.dev → 3.18.0 identify merge conflicts #1418: Commit 6a1a67c pushed by DiamondLightSource-build-server
January 15, 2024 12:09 12s dials-3.18rc
dials-3.18rc
January 15, 2024 12:09 12s
DIALS 3.17.1 identify merge conflicts #1417: Commit a27ea2d pushed by DiamondLightSource-build-server
January 15, 2024 04:57 14s dials-3.17rc
dials-3.17rc
January 15, 2024 04:57 14s
Rename newsfragments/xxx.bugfix to newsfragments/679.bugfix identify merge conflicts #1416: Commit 5caded7 pushed by DiamondLightSource-build-server
January 11, 2024 15:19 12s FormatMRC-with-unused-space-in-the-ext-header
FormatMRC-with-unused-space-in-the-ext-header
January 11, 2024 15:19 12s
news identify merge conflicts #1415: Commit 60981be pushed by dagewa
January 11, 2024 15:15 14s FormatMRC-with-unused-space-in-the-ext-header
FormatMRC-with-unused-space-in-the-ext-header
January 11, 2024 15:15 14s
Bump version: 3.18.dev → 3.19.dev identify merge conflicts #1414: Commit 9eaf763 pushed by DiamondLightSource-build-server
January 9, 2024 14:50 14s dials-3.18rc-main
dials-3.18rc-main
January 9, 2024 14:50 14s
Bump version: 3.18.dev → 3.18.0 identify merge conflicts #1413: Commit 602e376 pushed by DiamondLightSource-build-server
January 9, 2024 14:50 14s dials-3.18rc
dials-3.18rc
January 9, 2024 14:50 14s
DIALS 3.17.1 identify merge conflicts #1412: Commit ab7aa70 pushed by DiamondLightSource-build-server
January 8, 2024 04:57 11s dials-3.17rc
dials-3.17rc
January 8, 2024 04:57 11s
DIALS 3.17.1 identify merge conflicts #1411: Commit 9800a50 pushed by DiamondLightSource-build-server
January 1, 2024 04:57 9s dials-3.17rc
dials-3.17rc
January 1, 2024 04:57 9s
DIALS 3.17.1 identify merge conflicts #1410: Commit 5c404d9 pushed by DiamondLightSource-build-server
December 25, 2023 04:57 9s dials-3.17rc
dials-3.17rc
December 25, 2023 04:57 9s
DIALS 3.17.1 identify merge conflicts #1409: Commit f5b022e pushed by DiamondLightSource-build-server
December 18, 2023 04:57 13s dials-3.17rc
dials-3.17rc
December 18, 2023 04:57 13s