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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fix bug in LoadNGEM where Min/MaxEventsPerFrame were not respected Check for merge conflicts #17020: Pull request #38564 synchronize by RichardWaiteSTFC
January 16, 2025 09:49 27s 38558_LoadNGEM_not_respecting_min_max_events
38558_LoadNGEM_not_respecting_min_max_events
January 16, 2025 09:49 27s
Capture c++ stack traces from core dump files on linux Check for merge conflicts #17019: Pull request #38600 synchronize by jhaigh0
January 16, 2025 09:29 27s 38405_capture_cpp_stacktraces_from_core_dumps
38405_capture_cpp_stacktraces_from_core_dumps
January 16, 2025 09:29 27s
Update cppcheck to 2.16.0 Check for merge conflicts #17018: Pull request #38459 synchronize by thomashampson
January 16, 2025 09:23 28s cppcheck_2_16
cppcheck_2_16
January 16, 2025 09:23 28s
[pre-commit.ci] pre-commit autoupdate Check for merge conflicts #17017: Pull request #38594 synchronize by sf1919
January 16, 2025 08:30 27s pre-commit-ci-update-config
pre-commit-ci-update-config
January 16, 2025 08:30 27s
Prepare for release candidate v6.11.0.3rc2 Check for merge conflicts #17016: Pull request #38609 opened by KedoKudo
January 15, 2025 19:05 26s ornl-next
ornl-next
January 15, 2025 19:05 26s
[pre-commit.ci] pre-commit autoupdate Check for merge conflicts #17015: Pull request #38594 synchronize by peterfpeterson
January 15, 2025 18:57 26s pre-commit-ci-update-config
pre-commit-ci-update-config
January 15, 2025 18:57 26s
Merge pull request #38591 from mantidproject/pychop_sns_update Check for merge conflicts #17014: Commit 6be0546 pushed by AndreiSavici
January 15, 2025 18:37 25s main
main
January 15, 2025 18:37 25s
Merge ornl-next into main Check for merge conflicts #17013: Commit 6c62fe3 pushed by mantid-builder
January 15, 2025 18:32 27s main
main
January 15, 2025 18:32 27s
Merge pull request #38608 from mantidproject/expose_fullBinsOnly_in_r… Check for merge conflicts #17012: Commit 4f567e7 pushed by walshmm
January 15, 2025 18:31 27s ornl-next
ornl-next
January 15, 2025 18:31 27s
[pre-commit.ci] pre-commit autoupdate Check for merge conflicts #17011: Pull request #38594 synchronize by peterfpeterson
January 15, 2025 17:26 29s pre-commit-ci-update-config
pre-commit-ci-update-config
January 15, 2025 17:26 29s
Merge pull request #38603 from rosswhitfield/disable_deprecated_qt_api Check for merge conflicts #17010: Commit 911eca1 pushed by KedoKudo
January 15, 2025 16:13 27s main
main
January 15, 2025 16:13 27s
36863 find global b matrix warnings Check for merge conflicts #17009: Pull request #38574 synchronize by andy-bridger
January 15, 2025 15:59 26s 36863-FindGlobalBMatrix-warnings
36863-FindGlobalBMatrix-warnings
January 15, 2025 15:59 26s
Include AlgoTimeRegister on all operating systems Check for merge conflicts #17008: Pull request #38601 synchronize by jclarkeSTFC
January 15, 2025 15:57 29s jclarkeSTFC:38597_include_alg_profiler_all_os
jclarkeSTFC:38597_include_alg_profiler_all_os
January 15, 2025 15:57 29s
Refactor WildesTest to reduce Code Duplication (#38529) Check for merge conflicts #17007: Commit 4e65600 pushed by robertapplin
January 15, 2025 15:31 27s main
main
January 15, 2025 15:31 27s
added and propagated FullBinsOnly flag - ornl-next Check for merge conflicts #17006: Pull request #38608 opened by walshmm
January 15, 2025 15:30 29s expose_fullBinsOnly_in_rebinragged_ornl_next
expose_fullBinsOnly_in_rebinragged_ornl_next
January 15, 2025 15:30 29s
Remove symmetry elements for SaveINS Check for merge conflicts #17005: Pull request #38605 synchronize by zjmorgan
January 15, 2025 15:26 28s fix_save_ins
fix_save_ins
January 15, 2025 15:26 28s
Rework Abins docs: input data formats info split out to another page … Check for merge conflicts #17004: Commit 9884255 pushed by robertapplin
January 15, 2025 14:57 29s main
main
January 15, 2025 14:57 29s
added and propagated FullBinsOnly flag (#38550) Check for merge conflicts #17003: Commit 30baff0 pushed by robertapplin
January 15, 2025 14:29 27s main
main
January 15, 2025 14:29 27s
Add output label option to ISIS Energy Transfer tab of Data Reduction Check for merge conflicts #17002: Pull request #38607 synchronize by MohamedAlmaki
January 15, 2025 14:16 30s 38410_specify_output
38410_specify_output
January 15, 2025 14:16 30s
Remove symmetry elements for SaveINS Check for merge conflicts #17001: Pull request #38605 synchronize by zjmorgan
January 15, 2025 14:04 27s fix_save_ins
fix_save_ins
January 15, 2025 14:04 27s
Merge pull request #38606 from ajjackson/abins-cache-error Check for merge conflicts #17000: Commit eb814b0 pushed by SilkeSchomann
January 15, 2025 13:59 27s main
main
January 15, 2025 13:59 27s
Rework Abins docs: input data formats info split out to another page Check for merge conflicts #16999: Pull request #38588 synchronize by ajjackson
January 15, 2025 13:45 26s docs-concepts-abins-data
docs-concepts-abins-data
January 15, 2025 13:45 26s
Add output label option to ISIS Energy Transfer tab of Data Reduction Check for merge conflicts #16998: Pull request #38607 synchronize by MohamedAlmaki
January 15, 2025 12:21 28s 38410_specify_output
38410_specify_output
January 15, 2025 12:21 28s
Include AlgoTimeRegister on all operating systems Check for merge conflicts #16997: Pull request #38601 synchronize by jclarkeSTFC
January 15, 2025 12:19 27s jclarkeSTFC:38597_include_alg_profiler_all_os
jclarkeSTFC:38597_include_alg_profiler_all_os
January 15, 2025 12:19 27s
Remove symmetry elements for SaveINS Check for merge conflicts #16996: Pull request #38605 synchronize by zjmorgan
January 15, 2025 12:13 26s fix_save_ins
fix_save_ins
January 15, 2025 12:13 26s