Skip to content

Actions: toastisme/dials

Actions

identify merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #33 from toastisme/add_line_profile_integration identify merge conflicts #226: Commit 943cbb0 pushed by toastisme
November 24, 2023 14:43 13s main
main
November 24, 2023 14:43 13s
Added basic line profile to tof integration. identify merge conflicts #225: Commit 253f645 pushed by toastisme
November 24, 2023 14:41 11s add_line_profile_integration
add_line_profile_integration
November 24, 2023 14:41 11s
Rename newsfragments/XXX.misc to newsfragments/2557.misc identify merge conflicts #224: Commit dcb48d6 pushed by DiamondLightSource-build-server
November 21, 2023 22:02 14s test_fixes_for_scan_changes
test_fixes_for_scan_changes
November 21, 2023 22:02 14s
Updated tests to reflect Scan changes from dxtbx #620, and updated te… identify merge conflicts #223: Commit a66b405 pushed by toastisme
November 21, 2023 21:59 16s test_fixes_for_scan_changes
test_fixes_for_scan_changes
November 21, 2023 21:59 16s
Update test_compare_orientation_matrices to reflect updated structure. identify merge conflicts #222: Commit 9c51546 pushed by toastisme
November 20, 2023 11:59 12s add_properties_to_scan_test_changes
add_properties_to_scan_test_changes
November 20, 2023 11:59 12s
Changed dxtbx back to main. identify merge conflicts #221: Commit e771fbd pushed by toastisme
November 15, 2023 10:24 10s add_properties_to_scan_test_changes
add_properties_to_scan_test_changes
November 15, 2023 10:24 10s
Merge pull request #32 from toastisme/predict_spots_for_asu identify merge conflicts #220: Commit 6bcac80 pushed by toastisme
November 15, 2023 10:17 12s main
main
November 15, 2023 10:17 12s
Added method to predict spots for asymmetric unit. identify merge conflicts #219: Commit 273b300 pushed by toastisme
November 15, 2023 10:16 13s predict_spots_for_asu
predict_spots_for_asu
November 15, 2023 10:16 13s
Merge pull request #31 from toastisme/allow_tof_goniometer identify merge conflicts #218: Commit 7b973b9 pushed by toastisme
October 5, 2023 11:44 12s main
main
October 5, 2023 11:44 12s
allow_tof_goniometer identify merge conflicts #217: Commit a0d08fd pushed by toastisme
October 5, 2023 11:41 13s allow_tof_goniometer
allow_tof_goniometer
October 5, 2023 11:41 13s
Merge pull request #30 from toastisme/reduce-tof-default-bbox identify merge conflicts #216: Commit 2fbd926 pushed by toastisme
October 3, 2023 14:56 13s main
main
October 3, 2023 14:56 13s
Reduced tof default bbox. identify merge conflicts #215: Commit cfd319a pushed by toastisme
October 3, 2023 14:55 16s reduce-tof-default-bbox
reduce-tof-default-bbox
October 3, 2023 14:55 16s
Merge pull request #29 from toastisme/add_wavelength_cal_to_refl identify merge conflicts #214: Commit 28a3b8a pushed by toastisme
September 28, 2023 15:14 12s main
main
September 28, 2023 15:14 12s
Add wavelength_cal to reflection table. identify merge conflicts #213: Commit ffe3f50 pushed by toastisme
September 28, 2023 15:13 18s add_wavelength_cal_to_refl
add_wavelength_cal_to_refl
September 28, 2023 15:13 18s
Merge remote-tracking branch 'upstream/main' into add_properties_to_s… identify merge conflicts #212: Commit 1aa3cc7 pushed by toastisme
August 21, 2023 09:35 12s add_properties_to_scan_test_changes
add_properties_to_scan_test_changes
August 21, 2023 09:35 12s
Merge pull request #28 from toastisme/add_refl_ids_to_centroid_bbox_info identify merge conflicts #211: Commit f245920 pushed by toastisme
August 16, 2023 23:14 12s main
main
August 16, 2023 23:14 12s
add_refl_ids_to_centroid_bbox_info identify merge conflicts #210: Commit 400ff01 pushed by toastisme
August 13, 2023 21:48 10s add_refl_ids_to_centroid_bbox_info
add_refl_ids_to_centroid_bbox_info
August 13, 2023 21:48 10s
Merge branch 'main' into add_properties_to_scan_test_changes identify merge conflicts #209: Commit a07022f pushed by dagewa
July 25, 2023 09:29 16s add_properties_to_scan_test_changes
add_properties_to_scan_test_changes
July 25, 2023 09:29 16s