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
1,674 workflow run results
1,674 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge ornl-next into main Check for merge conflicts #15781: Commit 23800b4 pushed by mantid-builder
28s main
main
28s
Merge pull request #38346 from peterfpeterson/matplotlib_and_ruff Check for merge conflicts #15780: Commit fd99f02 pushed by peterfpeterson
12s ornl-next
ornl-next
12s
Matplotlib 3.8 and ruff E402 - ornl-next Check for merge conflicts #15779: Pull request #38346 opened by peterfpeterson
26s peterfpeterson:matplotlib_and_ruff
peterfpeterson:matplotlib_and_ruff
26s
Enable E402 ruff check Check for merge conflicts #15778: Pull request #38333 synchronize by robertapplin
25s 0-enable-ruff-e402
0-enable-ruff-e402
25s
Rename some HeliumAnalyserEfficiency algorithm parameters Check for merge conflicts #15777: Pull request #38334 synchronize by yusufjimoh
29s 38290-rename-heliumanalyserefficiency-algorithm-parameters-for-consistency
38290-rename-heliumanalyserefficiency-algorithm-parameters-for-consistency
29s
Merge pull request #38319 from mantidproject/0-enable-ruff-e741 Check for merge conflicts #15776: Commit e3d8de8 pushed by peterfpeterson
28s main
main
28s
Rename some HeliumAnalyserEfficiency algorithm parameters Check for merge conflicts #15775: Pull request #38334 synchronize by yusufjimoh
28s 38290-rename-heliumanalyserefficiency-algorithm-parameters-for-consistency
38290-rename-heliumanalyserefficiency-algorithm-parameters-for-consistency
28s
No longer exclude Framework/PythonInterface/test directory from ruff checks Check for merge conflicts #15774: Pull request #38345 synchronize by pre-commit-ci bot
30s 0-ruff-avoid-excluding-test-file-directory
0-ruff-avoid-excluding-test-file-directory
30s
Merge pull request #38321 from mantidproject/add_test_for_mvp_creatio… Check for merge conflicts #15773: Commit 34f381a pushed by peterfpeterson
27s main
main
27s
No longer exclude Framework/PythonInterface/test directory from ruff checks Check for merge conflicts #15772: Pull request #38345 opened by robertapplin
28s 0-ruff-avoid-excluding-test-file-directory
0-ruff-avoid-excluding-test-file-directory
28s
Matplotlib 3.8 update (#38077) Check for merge conflicts #15771: Commit d929a84 pushed by robertapplin
31s main
main
31s
Add new pearl focus mode allowing user to specify which transverse detector modules to focus Check for merge conflicts #15770: Pull request #38344 opened by RichardWaiteSTFC
11s 38340_add_new_PEARL_focus_mode
38340_add_new_PEARL_focus_mode
11s
Merge pull request #38343 from robertapplin/0-refactor-eagroup-contex… Check for merge conflicts #15769: Commit 856b3c1 pushed by sf1919
27s main
main
27s
Extracted Logic in Pairing Table View to Presenter Check for merge conflicts #15768: Pull request #38213 synchronize by yusufjimoh
27s 38105-logic-in-the-pairingtableview
38105-logic-in-the-pairingtableview
27s
Add identifier for output workspaces in Elwin Interface Check for merge conflicts #15767: Pull request #37762 synchronize by adriazalvarez
26s label_output_workspaces
label_output_workspaces
26s
Rename some HeliumAnalyserEfficiency algorithm parameters Check for merge conflicts #15766: Pull request #38334 synchronize by yusufjimoh
26s 38290-rename-heliumanalyserefficiency-algorithm-parameters-for-consistency
38290-rename-heliumanalyserefficiency-algorithm-parameters-for-consistency
26s
Refactor eagroup_context_test for readability and speed Check for merge conflicts #15765: Pull request #38343 synchronize by robertapplin
25s robertapplin:0-refactor-eagroup-context-test
robertapplin:0-refactor-eagroup-context-test
25s
Refactor eagroup_context_test for readability and speed Check for merge conflicts #15764: Pull request #38343 opened by robertapplin
28s robertapplin:0-refactor-eagroup-context-test
robertapplin:0-refactor-eagroup-context-test
28s
Update Clang to version 18 on macOS Check for merge conflicts #15763: Pull request #38342 synchronize by jclarkeSTFC
26s 38335_clang_18
38335_clang_18
26s
Update Clang to version 18 on macOS Check for merge conflicts #15762: Pull request #38342 opened by jclarkeSTFC
25s 38335_clang_18
38335_clang_18
25s
Rename some HeliumAnalyserEfficiency algorithm parameters Check for merge conflicts #15761: Pull request #38334 synchronize by yusufjimoh
30s 38290-rename-heliumanalyserefficiency-algorithm-parameters-for-consistency
38290-rename-heliumanalyserefficiency-algorithm-parameters-for-consistency
30s
Merge pull request #38329 from mantidproject/use_stl_string_functions Check for merge conflicts #15760: Commit 1df61a4 pushed by robertapplin
27s main
main
27s
Matplotlib 3.8 update Check for merge conflicts #15759: Pull request #38077 synchronize by Despiix
27s Matplotlib-3.8-Update
Matplotlib-3.8-Update
27s
Merge ornl-next into main Check for merge conflicts #15758: Commit eafc31f pushed by mantid-builder
31s main
main
31s
Merge pull request #38338 from peterfpeterson/backport_38300_38318 Check for merge conflicts #15757: Commit abc1a92 pushed by peterfpeterson
13s ornl-next
ornl-next
13s