Skip to content

Actions: cctbx/dxtbx

Actions

identify merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Mandate VDS for NXmx format identify merge conflicts #3800: Pull request #785 synchronize by graeme-winter
February 21, 2025 13:24 14s
February 21, 2025 13:24 14s
Merge branch 'main' into nxmx-no-vds identify merge conflicts #3799: Commit 74465d1 pushed by graeme-winter
February 21, 2025 13:24 11s nxmx-no-vds
nxmx-no-vds
February 21, 2025 13:24 11s
FormatNXMX: Avoid storing duplicate static masks (#789) identify merge conflicts #3798: Commit 45f50b2 pushed by ndevenish
February 21, 2025 13:22 2m 15s main
main
February 21, 2025 13:22 2m 15s
Store unique masks in a dictionary to avoid duplication (FormatNXmx.py) identify merge conflicts #3797: Pull request #789 synchronize by yash4karan
February 21, 2025 12:17 9s
February 21, 2025 12:17 9s
Store unique masks in a dictionary to avoid duplication (FormatNXmx.py) identify merge conflicts #3796: Pull request #789 synchronize by ndevenish
February 21, 2025 09:13 15s
February 21, 2025 09:13 15s
Store unique masks in a dictionary to avoid duplication (FormatNXmx.py) identify merge conflicts #3795: Pull request #789 synchronize by yash4karan
February 20, 2025 17:25 10s
February 20, 2025 17:25 10s
Store unique masks in a dictionary to avoid duplication (FormatNXmx.py) identify merge conflicts #3794: Pull request #789 synchronize by yash4karan
February 20, 2025 16:26 10s
February 20, 2025 16:26 10s
Store unique masks in a dictionary to avoid duplication (FormatNXmx.py) identify merge conflicts #3793: Pull request #789 synchronize by DiamondLightSource-build-server
February 20, 2025 11:10 10s
February 20, 2025 11:10 10s
Store unique masks in a dictionary to avoid duplication (FormatNXmx.py) identify merge conflicts #3792: Pull request #789 synchronize by yash4karan
February 20, 2025 11:09 10s
February 20, 2025 11:09 10s
Support for Rigaku HyPix-Arc detectors identify merge conflicts #3791: Pull request #787 synchronize by dagewa
February 19, 2025 15:58 14s
February 19, 2025 15:58 14s
Have found the place in the ver 4 header where these camera constants identify merge conflicts #3790: Commit 2de24bf pushed by dagewa
February 19, 2025 15:58 11s FormatROD_Arc
FormatROD_Arc
February 19, 2025 15:58 11s
Avoid deprecations identify merge conflicts #3789: Pull request #788 synchronize by pre-commit-ci bot
February 17, 2025 10:17 2m 46s
February 17, 2025 10:17 2m 46s
[pre-commit.ci] auto fixes from pre-commit.com hooks identify merge conflicts #3788: Commit 0580eb0 pushed by pre-commit-ci bot
February 17, 2025 10:17 11s Deprecated-numpy-implicit-single-elt-array-conversion
Deprecated-numpy-implicit-single-elt-array-conversion
February 17, 2025 10:17 11s
Avoid deprecations identify merge conflicts #3787: Pull request #788 synchronize by DiamondLightSource-build-server
February 17, 2025 10:16 9s
February 17, 2025 10:16 9s
Rename newsfragments/xxx.bugfix to newsfragments/788.bugfix identify merge conflicts #3786: Commit 9c14686 pushed by DiamondLightSource-build-server
February 17, 2025 10:16 12s Deprecated-numpy-implicit-single-elt-array-conversion
Deprecated-numpy-implicit-single-elt-array-conversion
February 17, 2025 10:16 12s
News identify merge conflicts #3785: Commit 818ab0f pushed by dagewa
February 17, 2025 09:54 13s Deprecated-numpy-implicit-single-elt-array-conversion
Deprecated-numpy-implicit-single-elt-array-conversion
February 17, 2025 09:54 13s
Support for Rigaku HyPix-Arc detectors identify merge conflicts #3784: Pull request #787 synchronize by DiamondLightSource-build-server
February 14, 2025 10:03 12s
February 14, 2025 10:03 12s
Rename newsfragments/xxx.feature to newsfragments/787.feature identify merge conflicts #3783: Commit 16dd7d4 pushed by DiamondLightSource-build-server
February 14, 2025 10:03 9s FormatROD_Arc
FormatROD_Arc
February 14, 2025 10:03 9s
Add a 2D projection for correct display in the image viewer identify merge conflicts #3782: Commit 9d9b452 pushed by dagewa
February 14, 2025 09:59 13s FormatROD_Arc
FormatROD_Arc
February 14, 2025 09:59 13s
Mandate VDS for NXmx format identify merge conflicts #3781: Pull request #785 synchronize by pre-commit-ci bot
February 11, 2025 15:41 14s
February 11, 2025 15:41 14s
[pre-commit.ci] auto fixes from pre-commit.com hooks identify merge conflicts #3780: Commit 1d748c5 pushed by pre-commit-ci bot
February 11, 2025 15:41 10s nxmx-no-vds
nxmx-no-vds
February 11, 2025 15:41 10s
Mandate VDS for NXmx format identify merge conflicts #3779: Commit ca4034b pushed by graeme-winter
February 11, 2025 15:39 10s nxmx-no-vds
nxmx-no-vds
February 11, 2025 15:39 10s
Pass through resolve_path when the path is not accessible (#783) identify merge conflicts #3778: Commit 62e3332 pushed by dagewa
February 6, 2025 13:30 2m 11s main
main
February 6, 2025 13:30 2m 11s
Pass through resolve_path when the path is not accessible identify merge conflicts #3777: Pull request #783 synchronize by dagewa
February 5, 2025 15:58 14s
February 5, 2025 15:58 14s
Pass through resolve_path when the path is not accessible identify merge conflicts #3776: Pull request #783 synchronize by dagewa
February 4, 2025 14:14 10s
February 4, 2025 14:14 10s