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

Correct bug in gain determination identify merge conflicts #1407: Commit 6e6f55a pushed by dagewa
December 7, 2023 15:07 18s ED-1-formats
ED-1-formats
December 7, 2023 15:07 18s
Future files should have the gain calculation correct, but on the ass… identify merge conflicts #1406: Commit c8c8e03 pushed by dagewa
December 7, 2023 10:18 12s ED-1-formats
ED-1-formats
December 7, 2023 10:18 12s
Merge branch 'main' into ED-1-formats identify merge conflicts #1405: Commit de57a29 pushed by dagewa
December 7, 2023 09:54 12s ED-1-formats
ED-1-formats
December 7, 2023 09:54 12s
DIALS 3.17.1 identify merge conflicts #1404: Commit f34acce pushed by DiamondLightSource-build-server
December 4, 2023 04:57 13s dials-3.17rc
dials-3.17rc
December 4, 2023 04:57 13s
DIALS 3.17.1 identify merge conflicts #1403: Commit 53d988d pushed by DiamondLightSource-build-server
November 27, 2023 04:57 14s dials-3.17rc
dials-3.17rc
November 27, 2023 04:57 14s
DIALS 3.17.1 identify merge conflicts #1402: Commit e16ccd8 pushed by DiamondLightSource-build-server
November 24, 2023 16:25 12s dials-3.17rc
dials-3.17rc
November 24, 2023 16:25 12s
DIALS 3.17.1 identify merge conflicts #1401: Pull request #193 synchronize by ndevenish
November 24, 2023 16:21 16s
November 24, 2023 16:21 16s
Temporarily remove masking geometry warnings identify merge conflicts #1400: Commit 822c1c1 pushed by ndevenish
November 24, 2023 16:21 13s dials-next
dials-next
November 24, 2023 16:21 13s
Update FormatCBFFull test following scan changes (#670) identify merge conflicts #1399: Commit dbd7ede pushed by DiamondLightSource-build-server
November 24, 2023 16:16 11s main
main
November 24, 2023 16:16 11s
Fix scan comparison when slicing imagesets (#669) identify merge conflicts #1398: Commit 31f73a5 pushed by DiamondLightSource-build-server
November 24, 2023 11:21 8s main
main
November 24, 2023 11:21 8s
Merge pull request #669 from cctbx/fix_scan_comparison identify merge conflicts #1397: Commit a7e985e pushed by DiamondLightSource-build-server
November 24, 2023 11:11 12s main
main
November 24, 2023 11:11 12s
Add oscillation fix for Scan.set_image_range. (#667) identify merge conflicts #1396: Commit 5851627 pushed by DiamondLightSource-build-server
November 20, 2023 11:58 13s main
main
November 20, 2023 11:58 13s
DIALS 3.17.1 identify merge conflicts #1395: Commit 604122e pushed by DiamondLightSource-build-server
November 20, 2023 04:57 11s dials-3.17rc
dials-3.17rc
November 20, 2023 04:57 11s
Add properties table to Scan (#620) identify merge conflicts #1394: Commit 6883714 pushed by DiamondLightSource-build-server
November 15, 2023 10:06 14s main
main
November 15, 2023 10:06 14s
DIALS 3.17.1 identify merge conflicts #1393: Commit 17dcf36 pushed by DiamondLightSource-build-server
November 13, 2023 04:57 2m 13s dials-3.17rc
dials-3.17rc
November 13, 2023 04:57 2m 13s
Update removed datablock module and warning (#665) identify merge conflicts #1392: Commit f5d1419 pushed by ndevenish
November 6, 2023 15:26 14s dials-next
dials-next
November 6, 2023 15:26 14s
Update removed datablock module and warning (#665) identify merge conflicts #1391: Commit 27f168c pushed by DiamondLightSource-build-server
November 6, 2023 15:26 24s main
main
November 6, 2023 15:26 24s
Clean Clutter identify merge conflicts #1390: Commit 4c59ebc pushed by DiamondLightSource-build-server
November 5, 2023 05:12 10s main
main
November 5, 2023 05:12 10s
Bump version: 3.17.dev → 3.18.dev identify merge conflicts #1389: Commit 2562aa7 pushed by DiamondLightSource-build-server
November 3, 2023 21:40 12s main
main
November 3, 2023 21:40 12s
Bump version: 3.17.dev → 3.17.0 identify merge conflicts #1388: Commit 286ad1f pushed by DiamondLightSource-build-server
November 3, 2023 21:35 14s v3.17.0
v3.17.0
November 3, 2023 21:35 14s
Bump version: 3.17.dev → 3.17.0 identify merge conflicts #1387: Commit 286ad1f pushed by DiamondLightSource-build-server
November 3, 2023 21:35 9s dials-next
dials-next
November 3, 2023 21:35 9s
Bump version: 3.17.dev → 3.17.0 identify merge conflicts #1386: Commit 286ad1f pushed by DiamondLightSource-build-server
November 3, 2023 21:35 11s dials-3.17
dials-3.17
November 3, 2023 21:35 11s
Bump version: 3.17.dev → 3.18.dev identify merge conflicts #1385: Commit 2562aa7 pushed by DiamondLightSource-build-server
November 3, 2023 13:32 16s dials-3.17rc-main
dials-3.17rc-main
November 3, 2023 13:32 16s
Bump version: 3.17.dev → 3.17.0 identify merge conflicts #1384: Commit 286ad1f pushed by DiamondLightSource-build-server
November 3, 2023 13:32 13s dials-3.17rc
dials-3.17rc
November 3, 2023 13:32 13s
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
ProTip! You can narrow down the results and go further in time using created:<2023-11-03 or the other filters available.