Skip to content

Actions: rbauststfc/mantid

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
63 workflow runs
63 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Cppcheck suppression team delta - set 68 (#38752) Check for merge conflicts #63: Commit 071c61c pushed by rbauststfc
January 31, 2025 11:51 11s main
main
January 31, 2025 11:51 11s
Merge pull request #38751 from mantidproject/cppcheck_hackathon_set_64 Check for merge conflicts #62: Commit 1f26687 pushed by rbauststfc
January 30, 2025 09:16 10s main
main
January 30, 2025 09:16 10s
Merge release-next into main Check for merge conflicts #61: Commit e0bc8f0 pushed by rbauststfc
January 27, 2025 12:00 13s main
main
January 27, 2025 12:00 13s
Merge pull request #38625 from mantidproject/pre-commit-ci-update-config Check for merge conflicts #60: Commit 893609a pushed by rbauststfc
January 22, 2025 15:54 12s main
main
January 22, 2025 15:54 12s
Merge pull request #38577 from rbauststfc/fix_SANS_ZOOM_move_test Check for merge conflicts #59: Commit 27b1a2c pushed by rbauststfc
January 9, 2025 14:35 14s main
main
January 9, 2025 14:35 14s
Merge pull request #38556 from rosswhitfield/fix_sliceviewer_data_exc… Check for merge conflicts #58: Commit 67ac3fe pushed by rbauststfc
January 9, 2025 08:33 13s main
main
January 9, 2025 08:33 13s
Merge pull request #37750 from mantidproject/37538_mantidworkbench_en… Check for merge conflicts #57: Commit 40166e8 pushed by rbauststfc
January 6, 2025 13:48 12s main
main
January 6, 2025 13:48 12s
Merge pull request #37976 from mantidproject/37934_update_debugging_d… Check for merge conflicts #56: Commit cb34c3d pushed by rbauststfc
December 10, 2024 11:51 12s main
main
December 10, 2024 11:51 12s
Merge ornl-next into main Check for merge conflicts #55: Commit d12ff5b pushed by rbauststfc
December 4, 2024 14:53 12s main
main
December 4, 2024 14:53 12s
Merge pull request #38342 from mantidproject/38335_clang_18 Check for merge conflicts #54: Commit 72dbe87 pushed by rbauststfc
November 25, 2024 11:06 19s main
main
November 25, 2024 11:06 19s
Merge pull request #38431 from mantidproject/add_custom_mantid_develo… Check for merge conflicts #53: Commit adb07df pushed by rbauststfc
November 22, 2024 09:29 13s main
main
November 22, 2024 09:29 13s
Merge pull request #38334 from mantidproject/38290-rename-heliumanaly… Check for merge conflicts #52: Commit 7b21a39 pushed by rbauststfc
November 15, 2024 11:10 17s main
main
November 15, 2024 11:10 17s
Merge pull request #38372 from peterfpeterson/enumerated_string_gui Check for merge conflicts #51: Commit f6559b1 pushed by rbauststfc
November 11, 2024 08:16 15s main
main
November 11, 2024 08:16 15s
Merge pull request #37672 from mantidproject/36981-allow-bespoke-flip… Check for merge conflicts #50: Commit 4c2a82b pushed by rbauststfc
October 28, 2024 13:25 15s main
main
October 28, 2024 13:25 15s
Merge ornl-next into main Check for merge conflicts #49: Commit 10c753c pushed by rbauststfc
October 14, 2024 08:54 15s main
main
October 14, 2024 08:54 15s
Merge pull request #38138 from mantidproject/38136_alfview_crash Check for merge conflicts #48: Commit 14353e2 pushed by rbauststfc
October 9, 2024 10:36 17s release-next
release-next
October 9, 2024 10:36 17s
Merge pull request #38109 from mantidproject/pre-commit-ci-update-config Check for merge conflicts #47: Commit f42775c pushed by rbauststfc
October 2, 2024 08:13 21s main
main
October 2, 2024 08:13 21s
Merge pull request #38032 from mantidproject/update_release_checklist Check for merge conflicts #46: Commit 4a93399 pushed by rbauststfc
September 30, 2024 15:40 13s main
main
September 30, 2024 15:40 13s
Merge ornl-next into main Check for merge conflicts #45: Commit 21f28f7 pushed by rbauststfc
September 17, 2024 15:00 16s main
main
September 17, 2024 15:00 16s
Merge pull request #37975 from robertapplin/37973-fix-calculation-of-… Check for merge conflicts #44: Commit 2722e15 pushed by rbauststfc
September 17, 2024 14:52 14s release-next
release-next
September 17, 2024 14:52 14s
Merge pull request #37960 from peterfpeterson/black_to_ruff_format Check for merge conflicts #43: Commit 3fcd9f9 pushed by rbauststfc
September 17, 2024 14:51 15s release-next
release-next
September 17, 2024 14:51 15s
Merge pull request #37960 from peterfpeterson/black_to_ruff_format Check for merge conflicts #42: Commit 3fcd9f9 pushed by rbauststfc
September 12, 2024 07:44 15s main
main
September 12, 2024 07:44 15s
Merge ornl-next into main Check for merge conflicts #41: Commit a5ce8a4 pushed by rbauststfc
September 9, 2024 09:28 15s main
main
September 9, 2024 09:28 15s
Merge pull request #37767 from mantidproject/dont_delete_subtracted_w… Check for merge conflicts #40: Commit e7d3ba4 pushed by rbauststfc
August 22, 2024 08:05 12s main
main
August 22, 2024 08:05 12s
Merge pull request #37793 from rosswhitfield/ragged_binary_operations Check for merge conflicts #39: Commit 78d0301 pushed by rbauststfc
August 19, 2024 11:27 13s main
main
August 19, 2024 11:27 13s