Skip to content

Actions: dials/dxtbx

Actions

identify merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Rename newsfragments/xxx.feature to newsfragments/770.feature identify merge conflicts #1644: Commit d1af518 pushed by DiamondLightSource-build-server
November 7, 2024 12:05 16m 56s FormatSMVCetaD
FormatSMVCetaD
November 7, 2024 12:05 16m 56s
News identify merge conflicts #1643: Commit 30c5f1a pushed by dagewa
November 7, 2024 11:59 10m 55s FormatSMVCetaD
FormatSMVCetaD
November 7, 2024 11:59 10m 55s
NXmx: read data_scale_factor (#756) identify merge conflicts #1642: Commit 834cb48 pushed by DiamondLightSource-build-server
October 30, 2024 23:44 2m 12s main
main
October 30, 2024 23:44 2m 12s
Revert "Migrate dxtbx build backend to hatchling (#766)" identify merge conflicts #1641: Commit f30e353 pushed by DiamondLightSource-build-server
October 29, 2024 15:28 2m 12s main
main
October 29, 2024 15:28 2m 12s
MNT: Add hatchling explicitly to dependencies identify merge conflicts #1640: Commit cb8d706 pushed by DiamondLightSource-build-server
October 29, 2024 12:06 2m 15s main
main
October 29, 2024 12:06 2m 15s
Migrate dxtbx build backend to hatchling (#766) identify merge conflicts #1639: Commit 2727313 pushed by DiamondLightSource-build-server
October 29, 2024 11:53 2m 14s main
main
October 29, 2024 11:53 2m 14s
Bump version: 3.23.dev → 3.24.dev identify merge conflicts #1638: Commit fc96413 pushed by DiamondLightSource-build-server
October 28, 2024 09:02 36s dials-3.23rc-main
dials-3.23rc-main
October 28, 2024 09:02 36s
Bump version: 3.23.dev → 3.23.0 identify merge conflicts #1637: Commit 0e8d410 pushed by DiamondLightSource-build-server
October 28, 2024 09:02 15s dials-3.23rc
dials-3.23rc
October 28, 2024 09:02 15s
Add overloads for panel resolution methods to use beam objects (#767) identify merge conflicts #1636: Commit 76f9507 pushed by DiamondLightSource-build-server
October 25, 2024 08:28 2m 15s main
main
October 25, 2024 08:28 2m 15s
Bump version: 3.22.dev → 3.22.0 identify merge conflicts #1635: Commit f297104 pushed by ndevenish
October 17, 2024 18:39 17s v3.22.1
v3.22.1
October 17, 2024 18:39 17s
Bump version: 3.22.dev → 3.23.dev identify merge conflicts #1634: Commit 76a0a5b pushed by DiamondLightSource-build-server
October 15, 2024 14:03 2m 12s main
main
October 15, 2024 14:03 2m 12s
Bump version: 3.22.dev → 3.22.0 identify merge conflicts #1633: Commit f297104 pushed by DiamondLightSource-build-server
October 15, 2024 13:53 29s v3.22.0
v3.22.0
October 15, 2024 13:53 29s
Bump version: 3.22.dev → 3.22.0 identify merge conflicts #1632: Commit f297104 pushed by DiamondLightSource-build-server
October 15, 2024 13:53 13s dials-next
dials-next
October 15, 2024 13:53 13s
Bump version: 3.22.dev → 3.22.0 identify merge conflicts #1631: Commit f297104 pushed by DiamondLightSource-build-server
October 15, 2024 13:53 12s dials-3.22
dials-3.22
October 15, 2024 13:53 12s
Bump version: 3.22.dev → 3.23.dev identify merge conflicts #1630: Commit 76a0a5b pushed by DiamondLightSource-build-server
October 15, 2024 09:38 19s dials-3.22rc-main
dials-3.22rc-main
October 15, 2024 09:38 19s
Bump version: 3.22.dev → 3.22.0 identify merge conflicts #1629: Commit f297104 pushed by DiamondLightSource-build-server
October 15, 2024 09:38 13s dials-3.22rc
dials-3.22rc
October 15, 2024 09:38 13s
Switch dxtbx to Github Actions (#765) identify merge conflicts #1628: Commit bd65698 pushed by DiamondLightSource-build-server
October 15, 2024 08:55 2m 11s main
main
October 15, 2024 08:55 2m 11s
Tweaks identify merge conflicts #1627: Commit 9538ecf pushed by ndevenish
October 15, 2024 08:49 12s dials-tweaks-3.22
dials-tweaks-3.22
October 15, 2024 08:49 12s
Support 32 bit in nxs2cbf conversion (#759) identify merge conflicts #1626: Commit 3f0cbf7 pushed by DiamondLightSource-build-server
October 15, 2024 08:34 2m 16s main
main
October 15, 2024 08:34 2m 16s
i23 for run 4, 2024: row 21 of the modules has failed (#754) identify merge conflicts #1625: Commit 87993c9 pushed by DiamondLightSource-build-server
October 15, 2024 08:31 2m 14s main
main
October 15, 2024 08:31 2m 14s
Allow triangles in polygon masking (fixes #757) (#761) identify merge conflicts #1624: Commit 20e2a6e pushed by DiamondLightSource-build-server
October 15, 2024 07:45 2m 10s main
main
October 15, 2024 07:45 2m 10s
Bump version: 3.22.dev → 3.23.dev identify merge conflicts #1623: Commit 6bd7762 pushed by DiamondLightSource-build-server
October 15, 2024 06:57 9s dials-3.22rc-main
dials-3.22rc-main
October 15, 2024 06:57 9s
Bump version: 3.22.dev → 3.22.0 identify merge conflicts #1622: Commit 317651e pushed by DiamondLightSource-build-server
October 15, 2024 06:57 13s dials-3.22rc
dials-3.22rc
October 15, 2024 06:57 13s
Bump version: 3.22.dev → 3.23.dev identify merge conflicts #1621: Commit 0d40f32 pushed by DiamondLightSource-build-server
October 14, 2024 08:30 9s dials-3.22rc-main
dials-3.22rc-main
October 14, 2024 08:30 9s
Bump version: 3.22.dev → 3.22.0 identify merge conflicts #1620: Commit 6c574cb pushed by DiamondLightSource-build-server
October 14, 2024 08:30 10s dials-3.22rc
dials-3.22rc
October 14, 2024 08:30 10s