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,350 workflow runs
7,350 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

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
Merge release-next into main Check for merge conflicts #17046: Commit 39fb5ab pushed by mantid-builder
January 16, 2025 16:11 36s main
main
January 16, 2025 16:11 36s
Merge pull request #38459 from mantidproject/cppcheck_2_16 Check for merge conflicts #17045: Commit 703edc5 pushed by cailafinn
January 16, 2025 16:11 32s release-next
release-next
January 16, 2025 16:11 32s
Merge release-next into main Check for merge conflicts #17044: Commit 8529cc9 pushed by mantid-builder
January 16, 2025 16:05 31s main
main
January 16, 2025 16:05 31s
Merge pull request #38601 from jclarkeSTFC/38597_include_alg_profiler… Check for merge conflicts #17043: Commit 5ac5173 pushed by cailafinn
January 16, 2025 16:04 31s release-next
release-next
January 16, 2025 16:04 31s
6.13 release notes Check for merge conflicts #17042: Pull request #38612 opened by adriazalvarez
January 16, 2025 15:50 27s update_release_notes
update_release_notes
January 16, 2025 15:50 27s
Merge pull request #38564 from mantidproject/38558_LoadNGEM_not_respe… Check for merge conflicts #17041: Commit fc0059c pushed by thomashampson
January 16, 2025 15:37 11s release-next
release-next
January 16, 2025 15:37 11s
Change windows macro for warnings into compiler flags Check for merge conflicts #17040: Pull request #38611 opened by peterfpeterson
January 16, 2025 15:23 28s peterfpeterson:windows_suppress_warnings
peterfpeterson:windows_suppress_warnings
January 16, 2025 15:23 28s