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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge release-next into main Check for merge conflicts #14676: Commit 819ff8b pushed by mantid-builder
26s main
main
26s
Merge release-next into ornl-next Check for merge conflicts #14675: Commit 15b5051 pushed by mantid-builder
29s ornl-next
ornl-next
29s
Merge pull request #37929 from mantidproject/37528_add_subtraction_pr… Check for merge conflicts #14674: Commit f872150 pushed by SilkeSchomann
27s release-next
release-next
27s
Merge ornl-next into main Check for merge conflicts #14673: Commit 8b2cd4c pushed by mantid-builder
27s main
main
27s
Merge release-next into ornl-next Check for merge conflicts #14672: Commit c479852 pushed by mantid-builder
27s ornl-next
ornl-next
27s
Merge release-next into main Check for merge conflicts #14671: Commit a9246f4 pushed by mantid-builder
29s main
main
29s
Merge pull request #37937 from mantidproject/37594_sliceviewer_sample… Check for merge conflicts #14670: Commit 251c8f6 pushed by SilkeSchomann
28s release-next
release-next
28s
Merge ornl-next into main Check for merge conflicts #14669: Commit 7e056d5 pushed by mantid-builder
26s main
main
26s
Merge release-next into main Check for merge conflicts #14668: Commit 246f8e8 pushed by mantid-builder
13s main
main
13s
Merge release-next into ornl-next Check for merge conflicts #14667: Commit 0198cd0 pushed by mantid-builder
27s ornl-next
ornl-next
27s
37752 FindPeaksConvolve flaky Test fix Check for merge conflicts #14666: Pull request #37970 opened by warunawickramasingha
26s 37752_findpeaksconvolvetest_fix
37752_findpeaksconvolvetest_fix
26s
Merge pull request #37826 from mantidproject/35224_add_post_fitting Check for merge conflicts #14665: Commit c36a1c9 pushed by robertapplin
28s release-next
release-next
28s
Create release notes for 6.12 Check for merge conflicts #14664: Pull request #37968 opened by jclarkeSTFC
30s create_6_12_release_notes
create_6_12_release_notes
30s
Move from black to ruff-format - ornl-next Check for merge conflicts #14663: Pull request #37967 synchronize by peterfpeterson
26s peterfpeterson:black_to_ruff_format_ornlnext
peterfpeterson:black_to_ruff_format_ornlnext
26s
Add option to fit and subtract prompt pulse in HRPD data reduction Check for merge conflicts #14662: Pull request #37929 synchronize by RichardWaiteSTFC
29s 37528_add_subtraction_prompt_pulse_to_HRPD_reduction_class
37528_add_subtraction_prompt_pulse_to_HRPD_reduction_class
29s
Remove prompt pulse Check for merge conflicts #14661: Pull request #37932 synchronize by dmitry-ganyushin
28s RemovePromptPulse
RemovePromptPulse
28s
Merge ornl-next into main Check for merge conflicts #14660: Commit 76a3e0b pushed by mantid-builder
31s main
main
31s
Merge release-next into main Check for merge conflicts #14659: Commit 86461d6 pushed by mantid-builder
11s main
main
11s
Merge release-next into ornl-next Check for merge conflicts #14658: Commit f3dfc49 pushed by mantid-builder
28s ornl-next
ornl-next
28s
Merge pull request #37883 from mantidproject/fix_functionq_available_… Check for merge conflicts #14657: Commit 0a30598 pushed by robertapplin
31s release-next
release-next
31s
Merge ornl-next into main Check for merge conflicts #14656: Commit 5bc0bf9 pushed by mantid-builder
26s main
main
26s
Merge release-next into ornl-next Check for merge conflicts #14655: Commit 07a6c26 pushed by mantid-builder
32s ornl-next
ornl-next
32s
Merge pull request #37935 from mantidproject/37283-position-const-con… Check for merge conflicts #14654: Commit f1d16e6 pushed by thomashampson
19s release-next
release-next
19s
Merge pull request #37935 from mantidproject/37283-position-const-con… Check for merge conflicts #14653: Commit f1d16e6 pushed by thomashampson
29s main
main
29s
Merge pull request #37958 from mantidproject/37940-fix-IsoDiffRot-crash Check for merge conflicts #14652: Commit dd2925b pushed by AndreiSavici
33s main
main
33s