Skip to content

Actions: huwjenkins/dials

Actions

identify merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Data id fix (#2681) identify merge conflicts #78: Commit 97e2b73 pushed by huwjenkins
July 1, 2024 12:18 14s main
main
July 1, 2024 12:18 14s
Merge branch 'main' into export-shelx-complete-ins identify merge conflicts #77: Commit b540afe pushed by dagewa
April 15, 2024 13:23 12s export-shelx-complete-ins
export-shelx-complete-ins
April 15, 2024 13:23 12s
Merge branch 'main' into export-shelx-decimal-places identify merge conflicts #76: Commit 1b0e685 pushed by dagewa
April 15, 2024 13:22 11s export-shelx-decimal-places
export-shelx-decimal-places
April 15, 2024 13:22 11s
Update src/dials/util/export_shelx.py identify merge conflicts #75: Commit fcb7fe9 pushed by dagewa
April 15, 2024 13:19 11s export-shelx-complete-ins
export-shelx-complete-ins
April 15, 2024 13:19 11s
replace code from xia2.to_shelx in parse_compound() with regex-based … identify merge conflicts #74: Commit 322b31b pushed by huwjenkins
March 19, 2024 23:37 10s export-shelx-complete-ins
export-shelx-complete-ins
March 19, 2024 23:37 10s
Merge branch 'main' into export-shelx-decimal-places identify merge conflicts #73: Commit 994e137 pushed by dagewa
March 18, 2024 10:14 13s export-shelx-decimal-places
export-shelx-decimal-places
March 18, 2024 10:14 13s
Merge branch 'main' into export-shelx-complete-ins identify merge conflicts #72: Commit a7db41b pushed by dagewa
March 18, 2024 10:14 16s export-shelx-complete-ins
export-shelx-complete-ins
March 18, 2024 10:14 16s
Rename newsfragments/XXX.bugfix to newsfragments/2624.bugfix identify merge conflicts #71: Commit 5963bec pushed by DiamondLightSource-build-server
February 29, 2024 12:25 14s export-shelx-decimal-places
export-shelx-decimal-places
February 29, 2024 12:25 14s
News identify merge conflicts #70: Commit 0fcf228 pushed by huwjenkins
February 29, 2024 12:13 12s export-shelx-decimal-places
export-shelx-decimal-places
February 29, 2024 12:13 12s
Rename newsfragments/XXX.feature to newsfragments/2623.feature identify merge conflicts #69: Commit c450079 pushed by DiamondLightSource-build-server
February 29, 2024 11:38 14s export-shelx-complete-ins
export-shelx-complete-ins
February 29, 2024 11:38 14s
identify merge conflicts identify merge conflicts #68: by huwjenkins
February 29, 2024 11:23 11s export-shelx-complete-ins
export-shelx-complete-ins
February 29, 2024 11:23 11s
Add test identify merge conflicts #67: Commit 8c3999f pushed by huwjenkins
February 29, 2024 11:08 15s export-shelx-complete-ins
export-shelx-complete-ins
February 29, 2024 11:08 15s
dials.export: Add option to specify composition of asymmetric unit so… identify merge conflicts #66: Commit 81f7ffc pushed by huwjenkins
February 29, 2024 11:04 28s export-shelx-complete-ins
export-shelx-complete-ins
February 29, 2024 11:04 28s
dials.export: Add option to specify composition of asymmetric unit so… identify merge conflicts #65: Commit 9fb270f pushed by huwjenkins
February 29, 2024 10:53 17s export-shelx-complete-ins
export-shelx-complete-ins
February 29, 2024 10:53 17s
Fix scipy deprecation warning and doc build failure in pinkindexer.py… identify merge conflicts #64: Commit d2f8e5f pushed by huwjenkins
February 28, 2024 10:08 12s main
main
February 28, 2024 10:08 12s
Add exclude_images_multiple option to dials.slice_sequence (#2565) identify merge conflicts #63: Commit d24d035 pushed by huwjenkins
December 14, 2023 14:14 15s main
main
December 14, 2023 14:14 15s
Test for possibility of bad reindexing operators in minimum cell tran… identify merge conflicts #62: Commit ee29f83 pushed by huwjenkins
November 14, 2023 15:29 13s main
main
November 14, 2023 15:29 13s
Fix log output line in dials.symmetry. (#2523) identify merge conflicts #61: Commit af67cf6 pushed by huwjenkins
October 19, 2023 15:25 18s main
main
October 19, 2023 15:25 18s
DIALS 3.16.1 Changelog identify merge conflicts #60: Commit 0ab5c7d pushed by huwjenkins
September 19, 2023 08:36 12s main
main
September 19, 2023 08:36 12s
Update dials.show tests for dxtbx model changes (#2482) identify merge conflicts #59: Commit 93c1364 pushed by huwjenkins
August 7, 2023 08:40 13s main
main
August 7, 2023 08:40 13s