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
703 workflow run results
703 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Update ISIS Reflectometry documentation Check for merge conflicts #15067: Pull request #38134 opened by rbauststfc
29s rbauststfc:38128_update_refl_docs
rbauststfc:38128_update_refl_docs
29s
Use ruff to check for wild imports Check for merge conflicts #15066: Pull request #38068 synchronize by pre-commit-ci bot
32s 0-wild-imports
0-wild-imports
32s
Use ruff to check for wild imports Check for merge conflicts #15065: Pull request #38068 synchronize by robertapplin
29s 0-wild-imports
0-wild-imports
29s
Add flag to CompareWorkspaces so users can specify NaN == NaN behavior - ornl-next Check for merge conflicts #15064: Pull request #38125 synchronize by rboston628
28s ewm7196-nans-flag-ornl
ewm7196-nans-flag-ornl
28s
Deprecate IntegratePeakTimeSlices Check for merge conflicts #15063: Pull request #38133 synchronize by KyleQianliMa
30s deprecate_IntegratePeakTimeSlices
deprecate_IntegratePeakTimeSlices
30s
Deprecate IntegratePeakTimeSlices Check for merge conflicts #15062: Pull request #38133 opened by KyleQianliMa
29s deprecate_IntegratePeakTimeSlices
deprecate_IntegratePeakTimeSlices
29s
Move the ISIS SANS Interface Out of the Framework. Check for merge conflicts #15061: Pull request #38047 synchronize by cailafinn
26s cailafinn:37952_move_sans_gui
cailafinn:37952_move_sans_gui
26s
[pre-commit.ci] pre-commit autoupdate - ornl-next Check for merge conflicts #15060: Pull request #38132 opened by peterfpeterson
28s peterfpeterson:pre-commit-ci-update-config-ornlnext
peterfpeterson:pre-commit-ci-update-config-ornlnext
28s
Merge pull request #38100 from mantidproject/coverity_fixes Check for merge conflicts #15059: Commit 7cf3d49 pushed by SilkeSchomann
32s main
main
32s
Merge ornl-next into main Check for merge conflicts #15058: Commit cf0fae8 pushed by mantid-builder
27s main
main
27s
Merge release-next into main Check for merge conflicts #15057: Commit 70f9b1c pushed by mantid-builder
10s main
main
10s
Merge release-next into ornl-next Check for merge conflicts #15056: Commit 819ce65 pushed by mantid-builder
27s ornl-next
ornl-next
27s
Merge pull request #38096 from rbauststfc/38079_fix_beam_centre_finde… Check for merge conflicts #15055: Commit 4a47aa6 pushed by SilkeSchomann
46s release-next
release-next
46s
Merge ornl-next into main Check for merge conflicts #15054: Commit 90ddf13 pushed by mantid-builder
27s main
main
27s
Merge release-next into main Check for merge conflicts #15053: Commit c129601 pushed by mantid-builder
12s main
main
12s
Merge release-next into ornl-next Check for merge conflicts #15052: Commit beff9c7 pushed by mantid-builder
28s ornl-next
ornl-next
28s
Merge pull request #38117 from robertapplin/38116-cancel-algorithm-be… Check for merge conflicts #15051: Commit e997c38 pushed by SilkeSchomann
45s release-next
release-next
45s
Fix and reinstate SANSZOOM system test Check for merge conflicts #15050: Pull request #38130 opened by rbauststfc
25s rbauststfc:38088_fix_SANSZOOM_system_test
rbauststfc:38088_fix_SANSZOOM_system_test
25s
Release notes for 6.11 Check for merge conflicts #15049: Pull request #38129 opened by GuiMacielPereira
29s release-next-6-11
release-next-6-11
29s
Revert "Revert "Removed uses of load_module()"" Check for merge conflicts #15048: Pull request #38127 synchronize by jclarkeSTFC
29s jclarkeSTFC:37031_remove_deprecated_load_module_again
jclarkeSTFC:37031_remove_deprecated_load_module_again
29s
Sphinx 9 deprecations Check for merge conflicts #15047: Pull request #37887 synchronize by jclarkeSTFC
29s 37804_sphinx_9_deprecations
37804_sphinx_9_deprecations
29s
Revert "Revert "Removed uses of load_module()"" Check for merge conflicts #15046: Pull request #38127 opened by jclarkeSTFC
28s jclarkeSTFC:37031_remove_deprecated_load_module_again
jclarkeSTFC:37031_remove_deprecated_load_module_again
28s
Coverity fixes Check for merge conflicts #15045: Pull request #38100 synchronize by jclarkeSTFC
27s coverity_fixes
coverity_fixes
27s
- Added spin state order handling to PolarizationCorrectionFredrikze Correction Algorithm Check for merge conflicts #15044: Pull request #37672 synchronize by yusufjimoh
26s 36981-allow-bespoke-flipper-configurations-and-output-spin-state-in-polarizationcorrectionfredrikze
36981-allow-bespoke-flipper-configurations-and-output-spin-state-in-polarizationcorrectionfredrikze
26s
Merge pull request #38109 from mantidproject/pre-commit-ci-update-config Check for merge conflicts #15043: Commit f42775c pushed by SilkeSchomann
31s main
main
31s