Skip to content

Actions: dials/dxtbx

Actions

identify merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

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
Load lookups when not checking format (#760) identify merge conflicts #1619: Commit 4aadf21 pushed by DiamondLightSource-build-server
October 11, 2024 07:01 2m 11s main
main
October 11, 2024 07:01 2m 11s
Merge branch 'main' into load-lookups-when-not-checking-format identify merge conflicts #1618: Commit 31ba2cc pushed by dagewa
October 10, 2024 16:12 10s load-lookups-when-not-checking-format
load-lookups-when-not-checking-format
October 10, 2024 16:12 10s
Add FormatESSNMX to read data from the NMX detector at ESS. (#764) identify merge conflicts #1617: Commit 590713d pushed by DiamondLightSource-build-server
October 8, 2024 21:33 2m 12s main
main
October 8, 2024 21:33 2m 12s
Better error message, avoiding UnicodeDecodeError (#763) identify merge conflicts #1616: Commit 898072e pushed by DiamondLightSource-build-server
October 7, 2024 15:56 2m 12s main
main
October 7, 2024 15:56 2m 12s
Actually this is the only change needed to identify merge conflicts #1615: Commit a8e8de4 pushed by dagewa
October 3, 2024 14:27 10s Better-error-message-avoiding-UnicodeDecodeError
Better-error-message-avoiding-UnicodeDecodeError
October 3, 2024 14:27 10s
Rename newsfragments/xxx.bugfix to newsfragments/763.bugfix identify merge conflicts #1614: Commit ba8cdd9 pushed by DiamondLightSource-build-server
October 3, 2024 14:23 15s Better-error-message-avoiding-UnicodeDecodeError
Better-error-message-avoiding-UnicodeDecodeError
October 3, 2024 14:23 15s
News identify merge conflicts #1613: Commit db160be pushed by dagewa
October 3, 2024 14:22 16s Better-error-message-avoiding-UnicodeDecodeError
Better-error-message-avoiding-UnicodeDecodeError
October 3, 2024 14:22 16s
Refactor panel positions of FormatISISSXD (#762) identify merge conflicts #1612: Commit 2bde8b8 pushed by DiamondLightSource-build-server
October 2, 2024 22:11 2m 14s main
main
October 2, 2024 22:11 2m 14s
MNT: Pin old micromamba to avoid issue identify merge conflicts #1611: Commit 9cbe8d5 pushed by DiamondLightSource-build-server
October 2, 2024 07:37 2m 15s main
main
October 2, 2024 07:37 2m 15s