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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Add additional support for saving data using the ISIS Sans Command Interface Check for merge conflicts #17555: Pull request #38618 synchronize by adriazalvarez
January 31, 2025 13:22 26s command_interface_save
command_interface_save
January 31, 2025 13:22 26s
Reimplement #38486 to avoid project recovery error Check for merge conflicts #17554: Pull request #38770 opened by jhaigh0
January 31, 2025 12:16 29s 38650_project_recovery_plots_fix
38650_project_recovery_plots_fix
January 31, 2025 12:16 29s
Replace some uses of Poco::Path with std::filesystem::path Check for merge conflicts #17553: Pull request #38761 synchronize by jclarkeSTFC
January 31, 2025 12:13 29s 37868_migrate_to_std_filesystem
37868_migrate_to_std_filesystem
January 31, 2025 12:13 29s
CPPCheck Team Bravo Set 50 Check for merge conflicts #17552: Pull request #38716 synchronize by Despiix
January 31, 2025 11:52 29s cpp-check-Set-50
cpp-check-Set-50
January 31, 2025 11:52 29s
Cppcheck suppression team delta - set 68 (#38752) Check for merge conflicts #17551: Commit 071c61c pushed by rbauststfc
January 31, 2025 11:46 27s main
main
January 31, 2025 11:46 27s
Bravo team cppcheck set 20 (#38754) Check for merge conflicts #17550: Commit 081abb6 pushed by rbauststfc
January 31, 2025 11:44 30s main
main
January 31, 2025 11:44 30s
CPPCheck Team Bravo Set 50 Check for merge conflicts #17549: Pull request #38716 synchronize by Despiix
January 31, 2025 11:32 29s cpp-check-Set-50
cpp-check-Set-50
January 31, 2025 11:32 29s
CPPCheck Team Bravo Set 50 Check for merge conflicts #17548: Pull request #38716 synchronize by Despiix
January 31, 2025 11:21 26s cpp-check-Set-50
cpp-check-Set-50
January 31, 2025 11:21 26s
Fix bug in Fit_Parameter getConstraint Check for merge conflicts #17547: Pull request #38769 synchronize by sf1919
January 31, 2025 10:58 26s Fit_Parameter_cppcheck_bug_v2
Fit_Parameter_cppcheck_bug_v2
January 31, 2025 10:58 26s
Fix bug in Fit_Parameter getConstraint Check for merge conflicts #17546: Pull request #38769 opened by sf1919
January 31, 2025 10:55 26s Fit_Parameter_cppcheck_bug_v2
Fit_Parameter_cppcheck_bug_v2
January 31, 2025 10:55 26s
Bravo team cppcheck set 41 Check for merge conflicts #17545: Pull request #38731 synchronize by sf1919
January 31, 2025 10:24 25s bravo_team_cppcheck_set_41
bravo_team_cppcheck_set_41
January 31, 2025 10:24 25s
Cppcheck suppression team delta - set 61 Check for merge conflicts #17544: Pull request #38759 synchronize by SilkeSchomann
January 31, 2025 09:54 29s fix_suppression_set_61
fix_suppression_set_61
January 31, 2025 09:54 29s
Remove AlignDetectors algorithm Check for merge conflicts #17543: Pull request #37799 synchronize by RichardWaiteSTFC
January 31, 2025 09:41 25s 31258_aligndetectors
31258_aligndetectors
January 31, 2025 09:41 25s
Replace some uses of Poco::Path with std::filesystem::path Check for merge conflicts #17542: Pull request #38761 synchronize by jclarkeSTFC
January 31, 2025 09:39 26s 37868_migrate_to_std_filesystem
37868_migrate_to_std_filesystem
January 31, 2025 09:39 26s
Cppcheck suppression team delta - set 61 Check for merge conflicts #17541: Pull request #38759 synchronize by SilkeSchomann
January 31, 2025 09:38 30s fix_suppression_set_61
fix_suppression_set_61
January 31, 2025 09:38 30s
Bravo team cppcheck set 20 Check for merge conflicts #17540: Pull request #38754 synchronize by sf1919
January 31, 2025 09:07 25s bravo_team_cppcheck_set_20
bravo_team_cppcheck_set_20
January 31, 2025 09:07 25s
Bravo team cppcheck set 20 Check for merge conflicts #17539: Pull request #38754 synchronize by sf1919
January 31, 2025 09:07 26s bravo_team_cppcheck_set_20
bravo_team_cppcheck_set_20
January 31, 2025 09:07 26s
Remove AlignDetectors algorithm Check for merge conflicts #17538: Pull request #37799 synchronize by RichardWaiteSTFC
January 31, 2025 09:07 29s 31258_aligndetectors
31258_aligndetectors
January 31, 2025 09:07 29s
Cppcheck suppression team delta - set 61 Check for merge conflicts #17537: Pull request #38759 synchronize by SilkeSchomann
January 31, 2025 08:51 26s fix_suppression_set_61
fix_suppression_set_61
January 31, 2025 08:51 26s
Cppcheck suppression team delta - set 68 Check for merge conflicts #17536: Pull request #38752 synchronize by SilkeSchomann
January 31, 2025 08:11 28s fix_suppression_set_68
fix_suppression_set_68
January 31, 2025 08:11 28s
Cppcheck suppression team delta - set 68 Check for merge conflicts #17535: Pull request #38752 synchronize by SilkeSchomann
January 31, 2025 07:54 26s fix_suppression_set_68
fix_suppression_set_68
January 31, 2025 07:54 26s
Merge pull request #38680 from mantidproject/36018-system-tests-for-i… Check for merge conflicts #17534: Commit ec588a8 pushed by SilkeSchomann
January 31, 2025 07:48 30s main
main
January 31, 2025 07:48 30s
Migrate SaveNexusProcessedHelper from napi to NeXusFile Check for merge conflicts #17533: Pull request #38767 synchronize by rosswhitfield
January 31, 2025 05:44 29s rosswhitfield:SaveNexusProcessedHelper_napi_to_NeXusFile
rosswhitfield:SaveNexusProcessedHelper_napi_to_NeXusFile
January 31, 2025 05:44 29s
Migrate SaveNexusProcessedHelper from napi to NeXusFile Check for merge conflicts #17532: Pull request #38767 synchronize by rosswhitfield
January 31, 2025 05:10 29s rosswhitfield:SaveNexusProcessedHelper_napi_to_NeXusFile
rosswhitfield:SaveNexusProcessedHelper_napi_to_NeXusFile
January 31, 2025 05:10 29s
Migrate SaveNexusProcessedHelper from napi to NeXusFile Check for merge conflicts #17531: Pull request #38767 opened by rosswhitfield
January 31, 2025 04:59 29s rosswhitfield:SaveNexusProcessedHelper_napi_to_NeXusFile
rosswhitfield:SaveNexusProcessedHelper_napi_to_NeXusFile
January 31, 2025 04:59 29s