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

FormatMRC: relax MZ check (#740) identify merge conflicts #3567: Commit 4e46bec pushed by dagewa
July 10, 2024 15:59 2m 14s main
main
July 10, 2024 15:59 2m 14s
Windows fix for FormatCBFMini identify merge conflicts #3566: Pull request #742 synchronize by DiamondLightSource-build-server
July 9, 2024 15:19 13s
July 9, 2024 15:19 13s
Add Nonius Kappa CCD format module identify merge conflicts #3565: Pull request #741 synchronize by DiamondLightSource-build-server
July 4, 2024 04:35 11s
July 4, 2024 04:35 11s
FormatMRC: relax MZ check identify merge conflicts #3564: Pull request #740 synchronize by DiamondLightSource-build-server
July 1, 2024 16:01 11s
July 1, 2024 16:01 11s
Create dxtbx.any2nexus dispatcher through setuptools (#739) identify merge conflicts #3563: Commit e8c2c92 pushed by ndevenish
June 23, 2024 06:29 2m 10s main
main
June 23, 2024 06:29 2m 10s
Create dxtbx.any2nexus dispatcher through setuptools identify merge conflicts #3562: Pull request #739 synchronize by DiamondLightSource-build-server
June 23, 2024 06:14 11s
June 23, 2024 06:14 11s
Rename newsfragments/XXX.misc to newsfragments/739.misc identify merge conflicts #3561: Commit 64b8602 pushed by DiamondLightSource-build-server
June 23, 2024 06:14 10s dispatcher_any2nexus
dispatcher_any2nexus
June 23, 2024 06:14 10s
Create dxtbx.any2nexus dispatcher through setuptools identify merge conflicts #3560: Commit a38695d pushed by ndevenish
June 23, 2024 06:09 18s dispatcher_any2nexus
dispatcher_any2nexus
June 23, 2024 06:09 18s
Bump version: 3.20.dev → 3.21.dev identify merge conflicts #3559: Commit d3fbb7f pushed by ndevenish
June 23, 2024 05:13 2m 11s main
main
June 23, 2024 05:13 2m 11s
Bump version: 3.20.dev → 3.20.0 identify merge conflicts #3558: Commit 09f4e52 pushed by DiamondLightSource-build-server
June 19, 2024 18:13 13s dials-3.20
dials-3.20
June 19, 2024 18:13 13s
Bump version: 3.20.dev → 3.20.0 identify merge conflicts #3557: Commit 09f4e52 pushed by DiamondLightSource-build-server
June 19, 2024 18:13 15s v3.20.0
v3.20.0
June 19, 2024 18:13 15s
Switch linting/formatting to ruff (#738) identify merge conflicts #3556: Commit dbcc7a4 pushed by ndevenish
June 7, 2024 09:59 2m 12s main
main
June 7, 2024 09:59 2m 12s
Switch linting/formatting to ruff identify merge conflicts #3555: Pull request #738 synchronize by ndevenish
June 7, 2024 09:24 17s
June 7, 2024 09:24 17s
Switch linting/formatting to ruff identify merge conflicts #3554: Pull request #738 synchronize by ndevenish
June 7, 2024 07:41 12s
June 7, 2024 07:41 12s
Switch linting/formatting to ruff identify merge conflicts #3553: Pull request #738 synchronize by ndevenish
June 6, 2024 16:29 13s
June 6, 2024 16:29 13s
Switch linting/formatting to ruff identify merge conflicts #3552: Pull request #738 synchronize by ndevenish
June 6, 2024 16:27 13s
June 6, 2024 16:27 13s
Switch linting/formatting to ruff identify merge conflicts #3551: Pull request #738 synchronize by DiamondLightSource-build-server
June 6, 2024 16:08 14s
June 6, 2024 16:08 14s
Switch linting/formatting to ruff identify merge conflicts #3550: Pull request #738 synchronize by ndevenish
June 6, 2024 16:08 2m 22s
June 6, 2024 16:08 2m 22s
Add Laue experiment type (#733) identify merge conflicts #3549: Commit 09de2a8 pushed by toastisme
May 31, 2024 09:53 2m 16s main
main
May 31, 2024 09:53 2m 16s
Add Laue experiment type identify merge conflicts #3548: Pull request #733 synchronize by toastisme
May 31, 2024 09:32 17s
May 31, 2024 09:32 17s
DIALS 3.19.1 Changelog identify merge conflicts #3547: Commit 209c71d pushed by DiamondLightSource-build-server
May 23, 2024 15:29 2m 16s main
main
May 23, 2024 15:29 2m 16s
identify merge conflicts identify merge conflicts #3546: by DiamondLightSource-build-server
May 23, 2024 15:28 16s v3.19.1
v3.19.1
May 23, 2024 15:28 16s
Fix old I03 data not processing (#737) identify merge conflicts #3545: Commit 713ce93 pushed by ndevenish
May 23, 2024 08:23 12s dials-next
dials-next
May 23, 2024 08:23 12s
MNT: Increase dev version that got out-of-sync identify merge conflicts #3544: Commit c0e9864 pushed by ndevenish
May 23, 2024 08:22 2m 18s main
main
May 23, 2024 08:22 2m 18s
Fix old I03 data not processing (#737) identify merge conflicts #3543: Commit c4fc39f pushed by ndevenish
May 23, 2024 08:16 2m 15s main
main
May 23, 2024 08:16 2m 15s