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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #38582 from mantidproject/refactor_Save_NXcanSAS Check for merge conflicts #16947: Commit 61bf054 pushed by SilkeSchomann
28s main
main
28s
Prepare for release candidate v6.11.0.3rc1 Check for merge conflicts #16946: Pull request #38592 opened by KedoKudo
27s ornl-next
ornl-next
27s
Add instance=True to mock.create_autospec for speed improvement Check for merge conflicts #16945: Pull request #38567 synchronize by jhaigh0
28s 38560_instance_true_for_create_autospec
38560_instance_true_for_create_autospec
28s
Refactor WildesTest to reduce Code Duplication Check for merge conflicts #16944: Pull request #38529 synchronize by yusufjimoh
27s 38326-refactor-polarizationcorrectionwildestest-to-reduce-code-duplication
38326-refactor-polarizationcorrectionwildestest-to-reduce-code-duplication
27s
Parial move of reflectometry gui to std::optional Check for merge conflicts #16943: Pull request #38545 synchronize by peterfpeterson
28s peterfpeterson:37875_boost_optional
peterfpeterson:37875_boost_optional
28s
Update pychop definitions for SNS instruments Check for merge conflicts #16942: Pull request #38591 opened by mducle
28s pychop_sns_update
pychop_sns_update
28s
Merge ornl-next into main Check for merge conflicts #16941: Commit 6ee0b15 pushed by mantid-builder
28s main
main
28s
Merge pull request #38590 from peterfpeterson/38332_nexus_sorted_incl… Check for merge conflicts #16940: Commit 3bc0c16 pushed by peterfpeterson
30s ornl-next
ornl-next
30s
37795 change polaris pdf norm Check for merge conflicts #16939: Pull request #38535 synchronize by andy-bridger
29s 37795_change_polaris_pdf_norm
37795_change_polaris_pdf_norm
29s
37795 change polaris pdf norm Check for merge conflicts #16938: Pull request #38535 synchronize by andy-bridger
27s 37795_change_polaris_pdf_norm
37795_change_polaris_pdf_norm
27s
37795 change polaris pdf norm Check for merge conflicts #16937: Pull request #38535 synchronize by andy-bridger
31s 37795_change_polaris_pdf_norm
37795_change_polaris_pdf_norm
31s
Merge pull request #38587 from rosswhitfield/sliceviewer_allow_custom… Check for merge conflicts #16936: Commit e9176f3 pushed by SilkeSchomann
28s main
main
28s
Allow users to register custom matplotlib colormaps Check for merge conflicts #16935: Pull request #38587 synchronize by rosswhitfield
26s rosswhitfield:sliceviewer_allow_custom_colormaps
rosswhitfield:sliceviewer_allow_custom_colormaps
26s
AlignAndFocusPowderSlim prototype Check for merge conflicts #16934: Pull request #38279 synchronize by peterfpeterson
26s peterfpeterson:ewm6343_aafpff_slim
peterfpeterson:ewm6343_aafpff_slim
26s
Remove clang-format suppressions - ornl-next Check for merge conflicts #16933: Pull request #38590 opened by peterfpeterson
29s peterfpeterson:38332_nexus_sorted_includes
peterfpeterson:38332_nexus_sorted_includes
29s
AlignAndFocusPowderSlim prototype Check for merge conflicts #16932: Pull request #38279 synchronize by peterfpeterson
25s peterfpeterson:ewm6343_aafpff_slim
peterfpeterson:ewm6343_aafpff_slim
25s
Merge pull request #38584 from peterfpeterson/38332_nexus_sorted_incl… Check for merge conflicts #16931: Commit a411fec pushed by AndreiSavici
27s main
main
27s
Merge ornl-next into main Check for merge conflicts #16930: Commit f579a71 pushed by mantid-builder
31s main
main
31s
Merge pull request #38589 from peterfpeterson/cc_gdo_docs Check for merge conflicts #16929: Commit 2a4279c pushed by peterfpeterson
28s ornl-next
ornl-next
28s
37795 change polaris pdf norm Check for merge conflicts #16928: Pull request #38535 synchronize by andy-bridger
25s 37795_change_polaris_pdf_norm
37795_change_polaris_pdf_norm
25s
Merge pull request #38581 from rbauststfc/add_exception_to_SANS_move_… Check for merge conflicts #16927: Commit be2990a pushed by SilkeSchomann
29s main
main
29s
37795 change polaris pdf norm Check for merge conflicts #16926: Pull request #38535 synchronize by andy-bridger
28s 37795_change_polaris_pdf_norm
37795_change_polaris_pdf_norm
28s
Remove clang-format suppressions Check for merge conflicts #16925: Pull request #38584 synchronize by peterfpeterson
30s peterfpeterson:38332_nexus_sorted_includes
peterfpeterson:38332_nexus_sorted_includes
30s
AlignAndFocusPowderSlim prototype Check for merge conflicts #16924: Pull request #38279 synchronize by peterfpeterson
26s peterfpeterson:ewm6343_aafpff_slim
peterfpeterson:ewm6343_aafpff_slim
26s
Parial move of reflectometry gui to std::optional Check for merge conflicts #16923: Pull request #38545 synchronize by peterfpeterson
29s peterfpeterson:37875_boost_optional
peterfpeterson:37875_boost_optional
29s