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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #38130 from rbauststfc/38088_fix_SANSZOOM_system_test Check for merge conflicts #15092: Commit cd71113 pushed by AndreiSavici
27s main
main
27s
Deprecate IntegratePeakTimeSlices Check for merge conflicts #15091: Pull request #38133 synchronize by KyleQianliMa
29s deprecate_IntegratePeakTimeSlices
deprecate_IntegratePeakTimeSlices
29s
Deprecate IntegratePeakTimeSlices Check for merge conflicts #15090: Pull request #38133 synchronize by KyleQianliMa
29s deprecate_IntegratePeakTimeSlices
deprecate_IntegratePeakTimeSlices
29s
Deprecate IntegratePeakTimeSlices Check for merge conflicts #15089: Pull request #38133 synchronize by KyleQianliMa
30s deprecate_IntegratePeakTimeSlices
deprecate_IntegratePeakTimeSlices
30s
enumerated string property Check for merge conflicts #15088: Pull request #38124 synchronize by rboston628
28s ewm2591-enumerated-string
ewm2591-enumerated-string
28s
enumerated string property Check for merge conflicts #15087: Pull request #38124 synchronize by pre-commit-ci bot
28s ewm2591-enumerated-string
ewm2591-enumerated-string
28s
enumerated string property Check for merge conflicts #15086: Pull request #38124 synchronize by rboston628
27s ewm2591-enumerated-string
ewm2591-enumerated-string
27s
Release notes for 6.11 Check for merge conflicts #15085: Pull request #38129 synchronize by GuiMacielPereira
28s release-next-6-11
release-next-6-11
28s
Merge ornl-next into main Check for merge conflicts #15084: Commit 7bfd9d7 pushed by mantid-builder
27s main
main
27s
Merge pull request #38132 from peterfpeterson/pre-commit-ci-update-co… Check for merge conflicts #15083: Commit 4288e59 pushed by peterfpeterson
11s ornl-next
ornl-next
11s
Refactor HRPD prompt pulse subtraction for readability Check for merge conflicts #15082: Pull request #37971 synchronize by RichardWaiteSTFC
28s 37969_refactor_HRPD_prompt_pulse_subtraction_func_for_readability
37969_refactor_HRPD_prompt_pulse_subtraction_func_for_readability
28s
Add missing plugins.algorithms to imports in SX peak integration algorithms Check for merge conflicts #15081: Pull request #38135 opened by RichardWaiteSTFC
27s fix_imports_in_sx_peak_integration_algs
fix_imports_in_sx_peak_integration_algs
27s
Use ruff to check for wild imports Check for merge conflicts #15080: Pull request #38068 synchronize by robertapplin
28s 0-wild-imports
0-wild-imports
28s
- Added spin state order handling to PolarizationCorrectionFredrikze Correction Algorithm Check for merge conflicts #15079: Pull request #37672 synchronize by yusufjimoh
28s 36981-allow-bespoke-flipper-configurations-and-output-spin-state-in-polarizationcorrectionfredrikze
36981-allow-bespoke-flipper-configurations-and-output-spin-state-in-polarizationcorrectionfredrikze
28s
Change members of EventList from value to unique_ptr Check for merge conflicts #15078: Pull request #38108 synchronize by peterfpeterson
32s peterfpeterson:event_unique_ptr
peterfpeterson:event_unique_ptr
32s
Merge ornl-next into main Check for merge conflicts #15077: Commit 64e100d pushed by mantid-builder
33s main
main
33s
Merge pull request #38125 from mantidproject/ewm7196-nans-flag-ornl Check for merge conflicts #15076: Commit a499eb9 pushed by rboston628
26s ornl-next
ornl-next
26s
Sphinx 9 deprecations Check for merge conflicts #15075: Pull request #37887 synchronize by jclarkeSTFC
28s 37804_sphinx_9_deprecations
37804_sphinx_9_deprecations
28s
Use ruff to check for wild imports Check for merge conflicts #15074: Pull request #38068 synchronize by robertapplin
24s 0-wild-imports
0-wild-imports
24s
Use ruff to check for wild imports Check for merge conflicts #15073: Pull request #38068 synchronize by pre-commit-ci bot
30s 0-wild-imports
0-wild-imports
30s
Use ruff to check for wild imports Check for merge conflicts #15072: Pull request #38068 synchronize by robertapplin
26s 0-wild-imports
0-wild-imports
26s
Deprecate IntegratePeakTimeSlices Check for merge conflicts #15071: Pull request #38133 synchronize by KyleQianliMa
27s deprecate_IntegratePeakTimeSlices
deprecate_IntegratePeakTimeSlices
27s
Deprecate IntegratePeakTimeSlices Check for merge conflicts #15070: Pull request #38133 synchronize by KyleQianliMa
29s deprecate_IntegratePeakTimeSlices
deprecate_IntegratePeakTimeSlices
29s
Sphinx 9 deprecations Check for merge conflicts #15069: Pull request #37887 synchronize by jclarkeSTFC
30s 37804_sphinx_9_deprecations
37804_sphinx_9_deprecations
30s
Deprecate IntegratePeakTimeSlices Check for merge conflicts #15068: Pull request #38133 synchronize by KyleQianliMa
29s deprecate_IntegratePeakTimeSlices
deprecate_IntegratePeakTimeSlices
29s