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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Remove clang-format suppressions Check for merge conflicts #16897: Pull request #38584 synchronize by peterfpeterson
33s peterfpeterson:38332_nexus_sorted_includes
peterfpeterson:38332_nexus_sorted_includes
33s
Merge pull request #38565 from peterfpeterson/gtest_pin Check for merge conflicts #16896: Commit 3163798 pushed by KedoKudo
27s main
main
27s
Merge pull request #38486 from mantidproject/mantidaxes_lines_and_ren… Check for merge conflicts #16895: Commit 0681ab2 pushed by peterfpeterson
26s main
main
26s
Remove clang-format suppressions Check for merge conflicts #16894: Pull request #38584 opened by peterfpeterson
27s peterfpeterson:38332_nexus_sorted_includes
peterfpeterson:38332_nexus_sorted_includes
27s
Ensure variable is initialised in Nexus code Check for merge conflicts #16893: Pull request #38583 opened by andy-bridger
26s napi5_systemtest_bug
napi5_systemtest_bug
26s
Refactor SaveNXcanSAS algorithm to support different variants Check for merge conflicts #16892: Pull request #38582 synchronize by adriazalvarez
27s refactor_Save_NXcanSAS
refactor_Save_NXcanSAS
27s
Refactor SaveNXcanSAS algorithm to support different variants Check for merge conflicts #16891: Pull request #38582 synchronize by adriazalvarez
30s refactor_Save_NXcanSAS
refactor_Save_NXcanSAS
30s
Refactor SaveNXcanSAS algorithm to support different variants Check for merge conflicts #16890: Pull request #38582 opened by adriazalvarez
27s refactor_Save_NXcanSAS
refactor_Save_NXcanSAS
27s
Merge ornl-next into main Check for merge conflicts #16889: Commit 17ee6bb pushed by mantid-builder
28s main
main
28s
Merge pull request #38579 from peterfpeterson/38457_generate_export_h… Check for merge conflicts #16888: Commit bc7e058 pushed by peterfpeterson
30s ornl-next
ornl-next
30s
Add exception to SANS move test helper method Check for merge conflicts #16887: Pull request #38581 synchronize by rbauststfc
27s rbauststfc:add_exception_to_SANS_move_test
rbauststfc:add_exception_to_SANS_move_test
27s
Add exception to SANS move test helper method Check for merge conflicts #16886: Pull request #38581 opened by rbauststfc
28s rbauststfc:add_exception_to_SANS_move_test
rbauststfc:add_exception_to_SANS_move_test
28s
Restore lost legend when dragged out of figure Check for merge conflicts #16885: Pull request #38580 synchronize by Despiix
28s restore-lost-legend
restore-lost-legend
28s
Restore lost legend when dragged out of figure Check for merge conflicts #16884: Pull request #38580 opened by Despiix
29s restore-lost-legend
restore-lost-legend
29s
Merge pull request #38577 from rbauststfc/fix_SANS_ZOOM_move_test Check for merge conflicts #16883: Commit 27b1a2c pushed by SilkeSchomann
29s main
main
29s
Remove includes of MantidKernel/System.h - ornl-next Check for merge conflicts #16882: Pull request #38579 opened by peterfpeterson
1m 17s peterfpeterson:38457_generate_export_header
peterfpeterson:38457_generate_export_header
1m 17s
Fix SANS move test failure Check for merge conflicts #16881: Pull request #38577 opened by rbauststfc
25s rbauststfc:fix_SANS_ZOOM_move_test
rbauststfc:fix_SANS_ZOOM_move_test
25s
Merge pull request #38573 from peterfpeterson/38457_generate_export_h… Check for merge conflicts #16880: Commit 77d3188 pushed by SilkeSchomann
27s main
main
27s
Merge pull request #38197 from mantidproject/38102_view_not_to_call_p… Check for merge conflicts #16879: Commit e6d3e6f pushed by SilkeSchomann
30s main
main
30s
Merge pull request #38514 from mantidproject/38030_remove_pop_up Check for merge conflicts #16878: Commit beadc9d pushed by SilkeSchomann
30s main
main
30s
38254 add PeakShapeDetectorbin to integration algorithms (#38452) Check for merge conflicts #16877: Commit 8eab7f1 pushed by robertapplin
29s main
main
29s
Add table view for group peak workspace (#37166) Check for merge conflicts #16876: Commit 24dcde3 pushed by robertapplin
30s main
main
30s
Merge pull request #38556 from rosswhitfield/fix_sliceviewer_data_exc… Check for merge conflicts #16875: Commit 67ac3fe pushed by SilkeSchomann
27s main
main
27s
AlignAndFocusPowderSlim prototype Check for merge conflicts #16874: Pull request #38279 synchronize by peterfpeterson
27s peterfpeterson:ewm6343_aafpff_slim
peterfpeterson:ewm6343_aafpff_slim
27s
added and propagated FullBinsOnly flag Check for merge conflicts #16873: Pull request #38550 synchronize by walshmm
28s expose_fullBinsOnly_in_rebinragged
expose_fullBinsOnly_in_rebinragged
28s
ProTip! You can narrow down the results and go further in time using created:<2025-01-08 or the other filters available.