Skip to content

Actions: dials/dxtbx

Actions

identify merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Bump version: 3.21.dev → 3.21.0 identify merge conflicts #1582: Commit 6c49b66 pushed by DiamondLightSource-build-server
August 19, 2024 11:43 16s dials-3.21rc
dials-3.21rc
August 19, 2024 11:43 16s
Tweaks identify merge conflicts #1581: Commit 4cc2835 pushed by ndevenish
August 19, 2024 11:33 16s dials-tweaks-3.21
dials-tweaks-3.21
August 19, 2024 11:33 16s
Extra checks for reading pickle-Format files (#744) identify merge conflicts #1580: Commit 38c95db pushed by DiamondLightSource-build-server
August 16, 2024 13:22 2m 14s main
main
August 16, 2024 13:22 2m 14s
Add Nonius Kappa CCD format module (#741) identify merge conflicts #1579: Commit 6c83b6e pushed by DiamondLightSource-build-server
August 16, 2024 13:19 2m 10s main
main
August 16, 2024 13:19 2m 10s
FormatSMVRigakuSaturnNoTS pedestal fix (#746) identify merge conflicts #1578: Commit 74fd1f1 pushed by DiamondLightSource-build-server
August 16, 2024 13:13 2m 11s main
main
August 16, 2024 13:13 2m 11s
Flumpy: Suppress a pybind11 warning on recent compilers (#748) identify merge conflicts #1577: Commit 3a42086 pushed by DiamondLightSource-build-server
August 16, 2024 12:57 2m 11s main
main
August 16, 2024 12:57 2m 11s
MNT: Update merge conflict labelling action identify merge conflicts #1576: Commit 0a0a2cb pushed by DiamondLightSource-build-server
August 16, 2024 12:51 2m 15s main
main
August 16, 2024 12:51 2m 15s
Merge branch 'main' into FormatSMVRigakuSaturnNoTS-fix identify merge conflicts #1575: Commit 3f61b11 pushed by ndevenish
August 16, 2024 12:43 14s FormatSMVRigakuSaturnNoTS-fix
FormatSMVRigakuSaturnNoTS-fix
August 16, 2024 12:43 14s
Maintenance: Set a CMake policy version (#749) identify merge conflicts #1574: Commit 9a8cff3 pushed by DiamondLightSource-build-server
August 16, 2024 12:38 2m 15s main
main
August 16, 2024 12:38 2m 15s
Pin numpy to <2 for CI (#750) identify merge conflicts #1573: Commit f3635ad pushed by DiamondLightSource-build-server
August 16, 2024 12:16 2m 14s main
main
August 16, 2024 12:16 2m 14s
Bump version: 3.21.dev → 3.22.dev identify merge conflicts #1572: Commit ef26ab9 pushed by DiamondLightSource-build-server
August 14, 2024 10:44 9s dials-3.21rc-main
dials-3.21rc-main
August 14, 2024 10:44 9s
Bump version: 3.21.dev → 3.21.0 identify merge conflicts #1571: Commit 05ddf1d pushed by DiamondLightSource-build-server
August 14, 2024 10:44 13s dials-3.21rc
dials-3.21rc
August 14, 2024 10:44 13s
Additional methods for FormatISISSXD to extract data more efficiently… identify merge conflicts #1570: Commit aebb3d9 pushed by DiamondLightSource-build-server
August 12, 2024 07:41 2m 11s main
main
August 12, 2024 07:41 2m 11s
Rename newsfragments/xxx.bugfix to newsfragments/746.bugfix identify merge conflicts #1569: Commit 6813284 pushed by DiamondLightSource-build-server
August 8, 2024 16:19 12s FormatSMVRigakuSaturnNoTS-fix
FormatSMVRigakuSaturnNoTS-fix
August 8, 2024 16:19 12s
News identify merge conflicts #1568: Commit 879bd18 pushed by dagewa
August 8, 2024 16:17 13s FormatSMVRigakuSaturnNoTS-fix
FormatSMVRigakuSaturnNoTS-fix
August 8, 2024 16:17 13s
Windows fix for FormatCBFMini (#742) identify merge conflicts #1567: Commit 3102224 pushed by DiamondLightSource-build-server
July 23, 2024 14:01 2m 12s main
main
July 23, 2024 14:01 2m 12s
FormatMRC: relax MZ check (#740) identify merge conflicts #1566: Commit 4e46bec pushed by DiamondLightSource-build-server
July 10, 2024 15:59 2m 13s main
main
July 10, 2024 15:59 2m 13s
Rename newsfragments/xxx.bugfix to newsfragments/742.bugfix identify merge conflicts #1565: Commit d621252 pushed by DiamondLightSource-build-server
July 9, 2024 15:19 10s Windows-fix-for-FormatCBFMini
Windows-fix-for-FormatCBFMini
July 9, 2024 15:19 10s
News identify merge conflicts #1564: Commit 12f1ce3 pushed by dagewa
July 9, 2024 15:17 17s Windows-fix-for-FormatCBFMini
Windows-fix-for-FormatCBFMini
July 9, 2024 15:17 17s
Rename newsfragments/xxx.bugfix to newsfragments/740.bugfix identify merge conflicts #1563: Commit 3c3787a pushed by DiamondLightSource-build-server
July 1, 2024 16:01 15s FormatMRC-relax-MZ-check
FormatMRC-relax-MZ-check
July 1, 2024 16:01 15s
News identify merge conflicts #1562: Commit c211ed7 pushed by dagewa
July 1, 2024 15:59 13s FormatMRC-relax-MZ-check
FormatMRC-relax-MZ-check
July 1, 2024 15:59 13s
Create dxtbx.any2nexus dispatcher through setuptools (#739) identify merge conflicts #1561: Commit e8c2c92 pushed by DiamondLightSource-build-server
June 23, 2024 06:29 2m 15s main
main
June 23, 2024 06:29 2m 15s
Bump version: 3.20.dev → 3.21.dev identify merge conflicts #1560: Commit d3fbb7f pushed by DiamondLightSource-build-server
June 23, 2024 05:13 2m 14s main
main
June 23, 2024 05:13 2m 14s
Bump version: 3.20.dev → 3.20.0 identify merge conflicts #1559: Commit 09f4e52 pushed by DiamondLightSource-build-server
June 19, 2024 18:13 10s v3.20.0
v3.20.0
June 19, 2024 18:13 10s
Bump version: 3.20.dev → 3.20.0 identify merge conflicts #1558: Commit 09f4e52 pushed by DiamondLightSource-build-server
June 19, 2024 18:13 12s dials-next
dials-next
June 19, 2024 18:13 12s