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

Tweak news identify merge conflicts #1383: Commit 4c4fa41 pushed by ndevenish
November 3, 2023 13:05 12s dials-tweaks-3.17
dials-tweaks-3.17
November 3, 2023 13:05 12s
Allow use of noninteractive backend for dxtbx.plot_detector_models (#… identify merge conflicts #1382: Commit 40327dd pushed by DiamondLightSource-build-server
November 3, 2023 12:58 16s main
main
November 3, 2023 12:58 16s
Bump version: 3.17.dev → 3.18.dev identify merge conflicts #1381: Commit 26f1bf3 pushed by DiamondLightSource-build-server
November 2, 2023 23:01 11s dials-3.17rc-main
dials-3.17rc-main
November 2, 2023 23:01 11s
Bump version: 3.17.dev → 3.17.0 identify merge conflicts #1380: Commit f4eb56a pushed by DiamondLightSource-build-server
November 2, 2023 23:01 14s dials-3.17rc
dials-3.17rc
November 2, 2023 23:01 14s
Do not invert for Pilatus 4 (#663) identify merge conflicts #1379: Commit 05b7806 pushed by DiamondLightSource-build-server
November 2, 2023 19:03 14s main
main
November 2, 2023 19:03 14s
Electron probe tweaks (#661) identify merge conflicts #1378: Commit 4ad0ce5 pushed by DiamondLightSource-build-server
October 11, 2023 14:21 15s main
main
October 11, 2023 14:21 15s
Rename XXX.* to 661.* identify merge conflicts #1377: Commit 8f92930 pushed by DiamondLightSource-build-server
October 11, 2023 12:45 10m 24s electron-probe-formats
electron-probe-formats
October 11, 2023 12:45 10m 24s
News ×2 identify merge conflicts #1376: Commit a0ddb0d pushed by dagewa
October 11, 2023 12:35 12m 23s electron-probe-formats
electron-probe-formats
October 11, 2023 12:35 12m 23s
Merge branch 'main' into ED-1-formats identify merge conflicts #1375: Commit 8bcb725 pushed by dagewa
October 10, 2023 16:25 17s ED-1-formats
ED-1-formats
October 10, 2023 16:25 17s
Clean Clutter identify merge conflicts #1374: Commit cd03663 pushed by DiamondLightSource-build-server
October 1, 2023 04:11 11s main
main
October 1, 2023 04:11 11s
Basic reader for miniCBF images from the ED-1. identify merge conflicts #1373: Commit 9729573 pushed by dagewa
September 29, 2023 15:50 14s ED-1-formats
ED-1-formats
September 29, 2023 15:50 14s
Basic reader for Bruker Format-100 images from the ELDICO ED-1 instru… identify merge conflicts #1372: Commit 6e14aa1 pushed by dagewa
September 29, 2023 13:56 12s ED-1-formats
ED-1-formats
September 29, 2023 13:56 12s
Break the DIALS/xfel circular dependency (#627) identify merge conflicts #1371: Commit 02954eb pushed by DiamondLightSource-build-server
September 26, 2023 23:00 10s main
main
September 26, 2023 23:00 10s
Use raw data instead of corrected data for cbf_writer (#660) identify merge conflicts #1370: Commit 258a65e pushed by DiamondLightSource-build-server
September 7, 2023 15:49 13s main
main
September 7, 2023 15:49 13s
DIALS 3.16.1 Changelog identify merge conflicts #1369: Commit 593c0ef pushed by DiamondLightSource-build-server
September 6, 2023 07:56 15s main
main
September 6, 2023 07:56 15s
DIALS 3.16.1 identify merge conflicts #1368: Pull request #189 synchronize by DiamondLightSource-build-server
September 6, 2023 07:54 17s
September 6, 2023 07:54 17s
DIALS 3.16.1 identify merge conflicts #1367: Commit 378377b pushed by DiamondLightSource-build-server
September 6, 2023 07:54 16s v3.16.1
v3.16.1
September 6, 2023 07:54 16s
DIALS 3.16.1 identify merge conflicts #1366: Commit 378377b pushed by DiamondLightSource-build-server
September 6, 2023 07:54 15s dials-3.16
dials-3.16
September 6, 2023 07:54 15s
Towncrier for 3.16.1 identify merge conflicts #1365: Commit 9408d3f pushed by DiamondLightSource-build-server
September 6, 2023 07:54 12s dials-next
dials-next
September 6, 2023 07:54 12s
DIALS 3.16.1 identify merge conflicts #1364: Commit 378377b pushed by DiamondLightSource-build-server
September 5, 2023 03:39 14s dials-3.16rc
dials-3.16rc
September 5, 2023 03:39 14s
DIALS 3.16.1 identify merge conflicts #1363: Commit 728ff7f pushed by DiamondLightSource-build-server
September 4, 2023 03:57 11s dials-3.16rc
dials-3.16rc
September 4, 2023 03:57 11s
DIALS 3.16.1 identify merge conflicts #1362: Commit 69fde79 pushed by DiamondLightSource-build-server
September 3, 2023 03:39 15s dials-3.16rc
dials-3.16rc
September 3, 2023 03:39 15s
DIALS 3.16.1 identify merge conflicts #1361: Commit 0e7c4b4 pushed by DiamondLightSource-build-server
September 2, 2023 03:39 12s dials-3.16rc
dials-3.16rc
September 2, 2023 03:39 12s
DIALS 3.16.1 identify merge conflicts #1360: Commit 26b8900 pushed by DiamondLightSource-build-server
September 1, 2023 03:39 15s dials-3.16rc
dials-3.16rc
September 1, 2023 03:39 15s
DIALS 3.16.1 identify merge conflicts #1359: Commit 99c0a97 pushed by DiamondLightSource-build-server
August 31, 2023 03:39 19s dials-3.16rc
dials-3.16rc
August 31, 2023 03:39 19s
ProTip! You can narrow down the results and go further in time using created:<2023-08-31 or the other filters available.