Skip to content

Actions: dials/dxtbx

Actions

identify merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

DIALS 3.19.1 Changelog identify merge conflicts #1545: Commit 209c71d pushed by DiamondLightSource-build-server
May 23, 2024 15:29 2m 13s main
main
May 23, 2024 15:29 2m 13s
DIALS 3.19.1 identify merge conflicts #1544: Pull request #203 synchronize by DiamondLightSource-build-server
May 23, 2024 15:28 13s
May 23, 2024 15:28 13s
DIALS 3.19.1 identify merge conflicts #1543: Commit f8245f1 pushed by DiamondLightSource-build-server
May 23, 2024 15:28 15s dials-3.19
dials-3.19
May 23, 2024 15:28 15s
Towncrier for 3.19.1 identify merge conflicts #1542: Commit 53e401d pushed by DiamondLightSource-build-server
May 23, 2024 15:28 15s dials-next
dials-next
May 23, 2024 15:28 15s
DIALS 3.19.1 identify merge conflicts #1541: Commit f8245f1 pushed by DiamondLightSource-build-server
May 23, 2024 15:28 14s v3.19.1
v3.19.1
May 23, 2024 15:28 14s
DIALS 3.19.1 identify merge conflicts #1540: Commit f8245f1 pushed by DiamondLightSource-build-server
May 23, 2024 08:29 10s dials-3.19rc
dials-3.19rc
May 23, 2024 08:29 10s
DIALS 3.17.1 identify merge conflicts #1539: Pull request #193 synchronize by ndevenish
May 23, 2024 08:27 9s
May 23, 2024 08:27 9s
Fix old I03 data not processing (#737) identify merge conflicts #1538: Commit 713ce93 pushed by ndevenish
May 23, 2024 08:27 10s dials-next
dials-next
May 23, 2024 08:27 10s
MNT: Increase dev version that got out-of-sync identify merge conflicts #1537: Commit c0e9864 pushed by DiamondLightSource-build-server
May 23, 2024 08:23 2m 11s main
main
May 23, 2024 08:23 2m 11s
Fix old I03 data not processing (#737) identify merge conflicts #1536: Commit c4fc39f pushed by DiamondLightSource-build-server
May 23, 2024 08:16 2m 12s main
main
May 23, 2024 08:16 2m 12s
Clean Clutter identify merge conflicts #1535: Commit 88c7db3 pushed by DiamondLightSource-build-server
May 12, 2024 04:10 2m 11s main
main
May 12, 2024 04:10 2m 11s
Add thin wrapper for nxmx_writer.py (dxtbx.any2nexus) (#735) identify merge conflicts #1534: Commit 22d297f pushed by DiamondLightSource-build-server
May 10, 2024 16:36 2m 14s main
main
May 10, 2024 16:36 2m 14s
Rename newsfragments/xxx.bugfix to newsfragments/736.bugfix identify merge conflicts #1533: Commit 12524e6 pushed by DiamondLightSource-build-server
May 10, 2024 10:17 13s FormatMRC-Y-flip
FormatMRC-Y-flip
May 10, 2024 10:17 13s
news identify merge conflicts #1532: Commit 5cb438d pushed by dagewa
May 10, 2024 10:04 11s FormatMRC-Y-flip
FormatMRC-Y-flip
May 10, 2024 10:04 11s
Fix Scan.get_property key type. (#734) identify merge conflicts #1531: Commit 3e875f0 pushed by DiamondLightSource-build-server
May 7, 2024 11:01 2m 12s main
main
May 7, 2024 11:01 2m 12s
Tweak gain for ELDICO ED-1 (#732) identify merge conflicts #1530: Commit 2732092 pushed by DiamondLightSource-build-server
April 30, 2024 13:59 2m 15s main
main
April 30, 2024 13:59 2m 15s
Update goniometer for FormatISISSXD (#731) identify merge conflicts #1529: Commit 4b64399 pushed by DiamondLightSource-build-server
April 30, 2024 10:06 2m 16s main
main
April 30, 2024 10:06 2m 16s
Rename newsfragments/xxx.misc to newsfragments/732.misc identify merge conflicts #1528: Commit 49e9cd1 pushed by DiamondLightSource-build-server
April 30, 2024 09:29 10s tweak-gain-for-ED-1
tweak-gain-for-ED-1
April 30, 2024 09:29 10s
News identify merge conflicts #1527: Commit 3cd750b pushed by dagewa
April 30, 2024 09:21 11s tweak-gain-for-ED-1
tweak-gain-for-ED-1
April 30, 2024 09:21 11s
Multi-axis goniometer needs axes= not axis= (#730) identify merge conflicts #1526: Commit 5289332 pushed by DiamondLightSource-build-server
April 30, 2024 08:27 2m 13s main
main
April 30, 2024 08:27 2m 13s
Rename newsfragments/xxx.bugfix to newsfragments/730.bugfix identify merge conflicts #1525: Commit 055ad95 pushed by DiamondLightSource-build-server
April 29, 2024 08:45 14s multi-axis-goniometer-needs-axes-not-axis
multi-axis-goniometer-needs-axes-not-axis
April 29, 2024 08:45 14s
News identify merge conflicts #1524: Commit 67d9c9d pushed by dagewa
April 29, 2024 08:43 14s multi-axis-goniometer-needs-axes-not-axis
multi-axis-goniometer-needs-axes-not-axis
April 29, 2024 08:43 14s
FormatROD set beam probe to electron for ED (#728) identify merge conflicts #1523: Commit 8f409a9 pushed by DiamondLightSource-build-server
April 26, 2024 15:20 2m 12s main
main
April 26, 2024 15:20 2m 12s
Allow ToF experiments to share models. (#721) identify merge conflicts #1522: Commit 60782d7 pushed by DiamondLightSource-build-server
April 26, 2024 14:11 2m 15s main
main
April 26, 2024 14:11 2m 15s
Add experiment type (#702) identify merge conflicts #1521: Commit 6fcf993 pushed by DiamondLightSource-build-server
April 24, 2024 14:06 2m 14s main
main
April 24, 2024 14:06 2m 14s