Skip to content

Actions: cctbx/dxtbx

Actions

identify merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

FormatSMVADSCCetaD (#770) identify merge conflicts #3723: Commit ea6fd5f pushed by dagewa
November 12, 2024 11:31 2m 15s main
main
November 12, 2024 11:31 2m 15s
FormatSMVADSCCetaD identify merge conflicts #3722: Pull request #770 synchronize by DiamondLightSource-build-server
November 7, 2024 12:05 13s
November 7, 2024 12:05 13s
Drop Python 3.9, 3.10 is now the new minimum identify merge conflicts #3721: Pull request #769 synchronize by DiamondLightSource-build-server
November 5, 2024 09:41 10s
November 5, 2024 09:41 10s
Add tqdm progress bar to dials.import identify merge conflicts #3720: Pull request #768 synchronize by graeme-winter
October 31, 2024 14:48 2m 14s
October 31, 2024 14:48 2m 14s
Test was using generator, change to list identify merge conflicts #3719: Commit 883c094 pushed by graeme-winter
October 31, 2024 14:48 13s import-progress
import-progress
October 31, 2024 14:48 13s
Add tqdm progress bar to dials.import identify merge conflicts #3718: Pull request #768 synchronize by graeme-winter
October 31, 2024 14:46 13s
October 31, 2024 14:46 13s
Add tqdm progress bar to dials.import identify merge conflicts #3717: Commit fde4a2b pushed by graeme-winter
October 31, 2024 14:46 9s import-progress
import-progress
October 31, 2024 14:46 9s
Add tqdm progress bar to dials.import identify merge conflicts #3716: Pull request #768 synchronize by graeme-winter
October 31, 2024 14:44 11s
October 31, 2024 14:44 11s
Test was using generator, change to list identify merge conflicts #3715: Commit c17eee6 pushed by graeme-winter
October 31, 2024 14:44 11s import-progress
import-progress
October 31, 2024 14:44 11s
Add tqdm progress bar to dials.import identify merge conflicts #3714: Pull request #768 synchronize by graeme-winter
October 31, 2024 14:37 9s
October 31, 2024 14:37 9s
Don't clobber iter identify merge conflicts #3713: Commit f515d42 pushed by graeme-winter
October 31, 2024 14:37 10s import-progress
import-progress
October 31, 2024 14:37 10s
Add tqdm progress bar to dials.import identify merge conflicts #3712: Pull request #768 synchronize by graeme-winter
October 31, 2024 14:34 11s
October 31, 2024 14:34 11s
Only show progress bar if > 1 file and isatty identify merge conflicts #3711: Commit cb5c5dc pushed by graeme-winter
October 31, 2024 14:34 11s import-progress
import-progress
October 31, 2024 14:34 11s
Add tqdm progress bar to dials.import identify merge conflicts #3710: Pull request #768 synchronize by DiamondLightSource-build-server
October 31, 2024 14:24 14s
October 31, 2024 14:24 14s
Rename newsfragments/XXX.feature to newsfragments/768.feature identify merge conflicts #3709: Commit 0d49337 pushed by DiamondLightSource-build-server
October 31, 2024 14:24 10s import-progress
import-progress
October 31, 2024 14:24 10s
Add tqdm progress bar to dials.import identify merge conflicts #3708: Commit c2a1e43 pushed by graeme-winter
October 31, 2024 14:24 14s import-progress
import-progress
October 31, 2024 14:24 14s
NXmx: read data_scale_factor (#756) identify merge conflicts #3707: Commit 834cb48 pushed by phyy-nx
October 30, 2024 23:44 2m 10s main
main
October 30, 2024 23:44 2m 10s
NXmx: read data_scale_factor identify merge conflicts #3706: Pull request #756 synchronize by phyy-nx
October 30, 2024 23:35 11s
October 30, 2024 23:35 11s
Code review identify merge conflicts #3705: Commit fea7453 pushed by phyy-nx
October 30, 2024 23:35 12s nxmx_gain
nxmx_gain
October 30, 2024 23:35 12s
NXmx: read data_scale_factor identify merge conflicts #3704: Pull request #756 synchronize by phyy-nx
October 29, 2024 23:59 10s
October 29, 2024 23:59 10s
Merge branch 'main' into nxmx_gain identify merge conflicts #3703: Commit 366e00f pushed by phyy-nx
October 29, 2024 23:59 10s nxmx_gain
nxmx_gain
October 29, 2024 23:59 10s
NXmx: read data_scale_factor identify merge conflicts #3702: Pull request #756 synchronize by phyy-nx
October 29, 2024 23:59 14s
October 29, 2024 23:59 14s
As scale factor is optional, allow NXdata to be optional identify merge conflicts #3701: Commit b3b500a pushed by phyy-nx
October 29, 2024 23:59 10s nxmx_gain
nxmx_gain
October 29, 2024 23:59 10s
Revert "Migrate dxtbx build backend to hatchling (#766)" identify merge conflicts #3700: Commit f30e353 pushed by ndevenish
October 29, 2024 15:27 2m 15s main
main
October 29, 2024 15:27 2m 15s
MNT: Add hatchling explicitly to dependencies identify merge conflicts #3699: Commit cb8d706 pushed by ndevenish
October 29, 2024 12:06 2m 9s main
main
October 29, 2024 12:06 2m 9s