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

Merge branch 'main' into 646-handling-image-templates-that-dont-use-z… identify merge conflicts #1483: Commit 0385dc1 pushed by ndevenish
March 18, 2024 08:55 14s 646-handling-image-templates-that-dont-use-zero-padding
646-handling-image-templates-that-dont-use-zero-padding
March 18, 2024 08:55 14s
Improve specificity further. identify merge conflicts #1482: Commit 49feec8 pushed by dagewa
March 17, 2024 10:24 10s 646-handling-image-templates-that-dont-use-zero-padding
646-handling-image-templates-that-dont-use-zero-padding
March 17, 2024 10:24 10s
Change tactic slightly: rather than extend the single digit template, identify merge conflicts #1481: Commit c7aa87a pushed by dagewa
March 16, 2024 17:07 11s 646-handling-image-templates-that-dont-use-zero-padding
646-handling-image-templates-that-dont-use-zero-padding
March 16, 2024 17:07 11s
FormatSMVJHSim AttributeError bugfix (#710) identify merge conflicts #1480: Commit 34d15fa pushed by dagewa
March 15, 2024 15:14 11s 646-handling-image-templates-that-dont-use-zero-padding
646-handling-image-templates-that-dont-use-zero-padding
March 15, 2024 15:14 11s
FormatSMVJHSim AttributeError bugfix (#710) identify merge conflicts #1479: Commit 080b599 pushed by DiamondLightSource-build-server
March 15, 2024 15:09 2m 14s main
main
March 15, 2024 15:09 2m 14s
Rename newsfragments/xxx.bugfix to newsfragments/710.bugfix identify merge conflicts #1478: Commit b7df8e0 pushed by DiamondLightSource-build-server
March 15, 2024 14:24 11s FormatSMVJHSim-bugfix
FormatSMVJHSim-bugfix
March 15, 2024 14:24 11s
News identify merge conflicts #1477: Commit c033525 pushed by dagewa
March 15, 2024 14:21 12s FormatSMVJHSim-bugfix
FormatSMVJHSim-bugfix
March 15, 2024 14:21 12s
Hit indices identify merge conflicts #1476: Pull request #198 synchronize by dermen
March 14, 2024 14:11 14s
March 14, 2024 14:11 14s
Improve specificity for simulated SMV format readers (#708) identify merge conflicts #1475: Commit 7615301 pushed by DiamondLightSource-build-server
March 13, 2024 13:30 2m 15s main
main
March 13, 2024 13:30 2m 15s
FormatXTC: add wavelength_fallback parameter identify merge conflicts #1474: Pull request #197 synchronize by phyy-nx
March 12, 2024 18:36 10s
March 12, 2024 18:36 10s
Rename newsfragments/xxx.bugfix to newsfragments/708.bugfix identify merge conflicts #1473: Commit ba8d890 pushed by DiamondLightSource-build-server
March 12, 2024 09:52 13s 706-formatsmvadscmlfsom-is-too-promiscuous
706-formatsmvadscmlfsom-is-too-promiscuous
March 12, 2024 09:52 13s
News identify merge conflicts #1472: Commit 877ea19 pushed by dagewa
March 12, 2024 09:48 12s 706-formatsmvadscmlfsom-is-too-promiscuous
706-formatsmvadscmlfsom-is-too-promiscuous
March 12, 2024 09:48 12s
Fix recently added ESRFJF4M format class (#707) identify merge conflicts #1471: Commit 78147cc pushed by DiamondLightSource-build-server
March 11, 2024 20:12 14s main
main
March 11, 2024 20:12 14s
Add format class for MANDI (#703) identify merge conflicts #1470: Commit 1da5d45 pushed by DiamondLightSource-build-server
March 11, 2024 09:43 13s main
main
March 11, 2024 09:43 13s
Rename newsfragments/xxx.feature to newsfragments/705.feature identify merge conflicts #1469: Commit 035fed9 pushed by DiamondLightSource-build-server
March 8, 2024 15:18 12s 646-handling-image-templates-that-dont-use-zero-padding
646-handling-image-templates-that-dont-use-zero-padding
March 8, 2024 15:18 12s
News identify merge conflicts #1468: Commit 526d572 pushed by dagewa
March 8, 2024 15:16 14s 646-handling-image-templates-that-dont-use-zero-padding
646-handling-image-templates-that-dont-use-zero-padding
March 8, 2024 15:16 14s
Relax conditions when interpolating between frames and time of flight… identify merge conflicts #1467: Commit 7964d4b pushed by DiamondLightSource-build-server
March 5, 2024 14:38 13s main
main
March 5, 2024 14:38 13s
Merge pull request #659 from cctbx/ESRF_SMX identify merge conflicts #1466: Commit 152fdb8 pushed by DiamondLightSource-build-server
March 1, 2024 14:30 55m 42s main
main
March 1, 2024 14:30 55m 42s
Merge pull request #699 from dials/set-distance-for-single-panel-dete… identify merge conflicts #1465: Commit 4251b75 pushed by DiamondLightSource-build-server
February 26, 2024 15:30 12s main
main
February 26, 2024 15:30 12s
Rename newsfragments/xxx.bugfix to newsfragments/699.bugfix identify merge conflicts #1464: Commit babbcc3 pushed by DiamondLightSource-build-server
February 26, 2024 14:59 10s set-distance-for-single-panel-detectors-with-hierarchy
set-distance-for-single-panel-detectors-with-hierarchy
February 26, 2024 14:59 10s
news identify merge conflicts #1463: Commit 531dfd5 pushed by dagewa
February 26, 2024 14:58 13s set-distance-for-single-panel-detectors-with-hierarchy
set-distance-for-single-panel-detectors-with-hierarchy
February 26, 2024 14:58 13s
Allow distance override for multi-panel detectors (#698) identify merge conflicts #1462: Commit 8f53e56 pushed by DiamondLightSource-build-server
February 26, 2024 12:55 10s main
main
February 26, 2024 12:55 10s
Clean Clutter identify merge conflicts #1461: Commit d18fde1 pushed by DiamondLightSource-build-server
February 25, 2024 05:11 16s main
main
February 25, 2024 05:11 16s
Rename newsfragments/xxx.feature to newsfragments/698.feature identify merge conflicts #1460: Commit 40fe02c pushed by DiamondLightSource-build-server
February 23, 2024 16:07 11s set-distance-for-multipanel-detectors
set-distance-for-multipanel-detectors
February 23, 2024 16:07 11s
news identify merge conflicts #1459: Commit 0b0b4e9 pushed by dagewa
February 23, 2024 16:06 12s set-distance-for-multipanel-detectors
set-distance-for-multipanel-detectors
February 23, 2024 16:06 12s