Skip to content

Actions: mantidproject/mantid

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
7,352 workflow runs
7,352 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fix pre-commit formatting Check for merge conflicts #17071: Pull request #38617 opened by sf1919
January 17, 2025 09:51 26s 38610_fix_formatting
38610_fix_formatting
January 17, 2025 09:51 26s
Create Monte Carlo Workspace Algorithm Check for merge conflicts #17070: Pull request #38341 synchronize by Despiix
January 17, 2025 09:34 30s Create_Monte_Carlo_Ws
Create_Monte_Carlo_Ws
January 17, 2025 09:34 30s
Relocate wrongly positioned v6.12.0 release notes Check for merge conflicts #17069: Pull request #38616 opened by thomashampson
January 17, 2025 09:20 27s move_incorrectly_place_6_12_release_notes
move_incorrectly_place_6_12_release_notes
January 17, 2025 09:20 27s
Remove AlignDetectors algorithm Check for merge conflicts #17068: Pull request #37799 synchronize by sf1919
January 17, 2025 07:48 28s 31258_aligndetectors
31258_aligndetectors
January 17, 2025 07:48 28s
Merge pull request #38615 from peterfpeterson/napi_systemtest_bug_orn… Check for merge conflicts #17067: Commit b53674e pushed by peterfpeterson
January 17, 2025 03:33 28s ornl-next
ornl-next
January 17, 2025 03:33 28s
Ensure variable is initialised in Nexus code - ornl-next Check for merge conflicts #17066: Pull request #38615 opened by peterfpeterson
January 17, 2025 01:45 25s peterfpeterson:napi_systemtest_bug_ornlnext
peterfpeterson:napi_systemtest_bug_ornlnext
January 17, 2025 01:45 25s
Merge pull request #38614 from peterfpeterson/cppcheck_2_16_ornlnext Check for merge conflicts #17065: Commit 40dd317 pushed by peterfpeterson
January 17, 2025 00:07 31s ornl-next
ornl-next
January 17, 2025 00:07 31s
Update cppcheck to 2.16.0 - ornlnext Check for merge conflicts #17064: Pull request #38614 synchronize by pre-commit-ci bot
January 16, 2025 22:25 29s peterfpeterson:cppcheck_2_16_ornlnext
peterfpeterson:cppcheck_2_16_ornlnext
January 16, 2025 22:25 29s
Update cppcheck to 2.16.0 - ornlnext Check for merge conflicts #17063: Pull request #38614 synchronize by peterfpeterson
January 16, 2025 22:22 29s peterfpeterson:cppcheck_2_16_ornlnext
peterfpeterson:cppcheck_2_16_ornlnext
January 16, 2025 22:22 29s
Update cppcheck to 2.16.0 - ornlnext Check for merge conflicts #17062: Pull request #38614 synchronize by peterfpeterson
January 16, 2025 21:49 27s peterfpeterson:cppcheck_2_16_ornlnext
peterfpeterson:cppcheck_2_16_ornlnext
January 16, 2025 21:49 27s
Update cppcheck to 2.16.0 - ornlnext Check for merge conflicts #17061: Pull request #38614 synchronize by pre-commit-ci bot
January 16, 2025 21:32 26s peterfpeterson:cppcheck_2_16_ornlnext
peterfpeterson:cppcheck_2_16_ornlnext
January 16, 2025 21:32 26s
Update cppcheck to 2.16.0 - ornlnext Check for merge conflicts #17060: Pull request #38614 synchronize by peterfpeterson
January 16, 2025 21:29 26s peterfpeterson:cppcheck_2_16_ornlnext
peterfpeterson:cppcheck_2_16_ornlnext
January 16, 2025 21:29 26s
Update cppcheck to 2.16.0 - ornlnext Check for merge conflicts #17059: Pull request #38614 synchronize by pre-commit-ci bot
January 16, 2025 19:13 27s peterfpeterson:cppcheck_2_16_ornlnext
peterfpeterson:cppcheck_2_16_ornlnext
January 16, 2025 19:13 27s
Update cppcheck to 2.16.0 - ornlnext Check for merge conflicts #17058: Pull request #38614 synchronize by peterfpeterson
January 16, 2025 19:10 27s peterfpeterson:cppcheck_2_16_ornlnext
peterfpeterson:cppcheck_2_16_ornlnext
January 16, 2025 19:10 27s
Merge pull request #38613 from peterfpeterson/pre-commit-ruff-ornlnext Check for merge conflicts #17057: Commit 5fc96e8 pushed by peterfpeterson
January 16, 2025 18:49 29s ornl-next
ornl-next
January 16, 2025 18:49 29s
Merge release-next into main Check for merge conflicts #17056: Commit e6f4919 pushed by mantid-builder
January 16, 2025 18:21 27s main
main
January 16, 2025 18:21 27s
Merge pull request #38574 from mantidproject/36863-FindGlobalBMatrix-… Check for merge conflicts #17055: Commit 61bccff pushed by SilkeSchomann
January 16, 2025 18:20 1m 19s release-next
release-next
January 16, 2025 18:20 1m 19s
Merge pull request #38612 from mantidproject/update_release_notes Check for merge conflicts #17054: Commit 2d44e11 pushed by thomashampson
January 16, 2025 17:54 31s main
main
January 16, 2025 17:54 31s
Update cppcheck to 2.16.0 - ornlnext Check for merge conflicts #17053: Pull request #38614 synchronize by peterfpeterson
January 16, 2025 17:35 26s peterfpeterson:cppcheck_2_16_ornlnext
peterfpeterson:cppcheck_2_16_ornlnext
January 16, 2025 17:35 26s
Change windows macro for warnings into compiler flags Check for merge conflicts #17052: Pull request #38611 synchronize by peterfpeterson
January 16, 2025 17:30 29s peterfpeterson:windows_suppress_warnings
peterfpeterson:windows_suppress_warnings
January 16, 2025 17:30 29s
Remove symmetry elements for SaveINS Check for merge conflicts #17051: Pull request #38605 synchronize by zjmorgan
January 16, 2025 17:21 27s fix_save_ins
fix_save_ins
January 16, 2025 17:21 27s
Update cppcheck to 2.16.0 - ornlnext Check for merge conflicts #17050: Pull request #38614 opened by peterfpeterson
January 16, 2025 16:59 26s peterfpeterson:cppcheck_2_16_ornlnext
peterfpeterson:cppcheck_2_16_ornlnext
January 16, 2025 16:59 26s
Remove symmetry elements for SaveINS Check for merge conflicts #17049: Pull request #38605 synchronize by zjmorgan
January 16, 2025 16:57 26s fix_save_ins
fix_save_ins
January 16, 2025 16:57 26s
pre-commit ruff update - ornl-next Check for merge conflicts #17048: Pull request #38613 opened by peterfpeterson
January 16, 2025 16:47 29s peterfpeterson:pre-commit-ruff-ornlnext
peterfpeterson:pre-commit-ruff-ornlnext
January 16, 2025 16:47 29s
36863 find global b matrix warnings Check for merge conflicts #17047: Pull request #38574 synchronize by andy-bridger
January 16, 2025 16:31 29s 36863-FindGlobalBMatrix-warnings
36863-FindGlobalBMatrix-warnings
January 16, 2025 16:31 29s