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
2,005 workflow run results
2,005 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Elwin Interface Sync into ornl-next Check for merge conflicts #16097: Pull request #38419 synchronize by mpatrou
29s label_output_workspaces_ornl
label_output_workspaces_ornl
29s
Elwin Interface Sync into ornl-next Check for merge conflicts #16096: Pull request #38419 synchronize by mpatrou
27s label_output_workspaces_ornl
label_output_workspaces_ornl
27s
Elwin Interface Sync into ornl-next Check for merge conflicts #16095: Pull request #38419 synchronize by mpatrou
28s label_output_workspaces_ornl
label_output_workspaces_ornl
28s
Merge pull request #38432 from peterfpeterson/pre-commit Check for merge conflicts #16094: Commit 5884900 pushed by peterfpeterson
28s ornl-next
ornl-next
28s
Elwin Interface Sync into ornl-next Check for merge conflicts #16093: Pull request #38419 synchronize by mpatrou
29s label_output_workspaces_ornl
label_output_workspaces_ornl
29s
Numpy 2 update Check for merge conflicts #16092: Pull request #38420 synchronize by jhaigh0
30s numpy_2
numpy_2
30s
Create Monte Carlo Workspace Algorithm Check for merge conflicts #16091: Pull request #38341 synchronize by Despiix
28s Create_Monte_Carlo_Ws
Create_Monte_Carlo_Ws
28s
Numpy 2 update Check for merge conflicts #16090: Pull request #38420 synchronize by peterfpeterson
28s numpy_2
numpy_2
28s
Add instructions for creating custom mantid-developer package Check for merge conflicts #16089: Pull request #38431 opened by jhaigh0
29s add_custom_mantid_developer_instructions
add_custom_mantid_developer_instructions
29s
Add mantidworkbench as an entry point for the mantidworkbench Conda package Check for merge conflicts #16088: Pull request #37750 synchronize by jclarkeSTFC
31s 37538_mantidworkbench_entry_point
37538_mantidworkbench_entry_point
31s
Fix ApplyFloodWorkspace algorithm not preserving values in missing spectra Check for merge conflicts #16087: Pull request #38430 opened by adriazalvarez
29s apply_floods_correctly
apply_floods_correctly
29s
Numpy 2 update Check for merge conflicts #16086: Pull request #38420 synchronize by jhaigh0
29s numpy_2
numpy_2
29s
Numpy 2 update Check for merge conflicts #16085: Pull request #38420 opened by jhaigh0
26s numpy_2
numpy_2
26s
Merge pull request #38373 from mantidproject/38293_settings_widget Check for merge conflicts #16084: Commit fb18652 pushed by RichardWaiteSTFC
31s main
main
31s
Elwin Interface Sync into ornl-next Check for merge conflicts #16083: Pull request #38419 opened by mpatrou
27s label_output_workspaces_ornl
label_output_workspaces_ornl
27s
Merge pull request #38417 from peterfpeterson/pystog_testfix Check for merge conflicts #16082: Commit d6fca4b pushed by peterfpeterson
12s ornl-next
ornl-next
12s
Resolve merge conflicts of ornl-next into main Check for merge conflicts #16081: Pull request #38418 opened by peterfpeterson
30s peterfpeterson:ornlnext_into_main
peterfpeterson:ornlnext_into_main
30s
Elwin Elastic line integration issue - Sister PR (#38416) Check for merge conflicts #16080: Commit 5984759 pushed by mpatrou
30s ornl-next
ornl-next
30s
Merge pull request #38385 from mantidproject/pre-commit-ci-update-config Check for merge conflicts #16079: Commit f9238c0 pushed by rboston628
29s main
main
29s
Put back pystog test data - ornl-next Check for merge conflicts #16078: Pull request #38417 opened by peterfpeterson
28s peterfpeterson:pystog_testfix
peterfpeterson:pystog_testfix
28s
Merge pull request #38414 from peterfpeterson/pystog_testfix Check for merge conflicts #16077: Commit 611b076 pushed by AndreiSavici
30s main
main
30s
Elwin Elastic line integration issue - Sister PR Check for merge conflicts #16076: Pull request #38416 opened by mpatrou
30s elwin_elastic_def_ornl
elwin_elastic_def_ornl
30s
Move H5Util file to Mantid::Nexus library Check for merge conflicts #16075: Pull request #38406 synchronize by robertapplin
28s robertapplin:38332-move-nexus-reading-code-to-nexus-library
robertapplin:38332-move-nexus-reading-code-to-nexus-library
28s
Put back pystog test data Check for merge conflicts #16074: Pull request #38414 opened by peterfpeterson
28s peterfpeterson:pystog_testfix
peterfpeterson:pystog_testfix
28s
Allow loading ILL data into S(Q,w) tab of Data Processor Check for merge conflicts #16073: Pull request #38413 synchronize by robertapplin
28s robertapplin:38038-load-ill-data-in-sqw
robertapplin:38038-load-ill-data-in-sqw
28s