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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Add single source of truth for absolute and relative differences to Mantid::Kernel::FloatingPointComparison Check for merge conflicts #14701: Pull request #37931 synchronize by rboston628
26s ewm5044-floating-point
ewm5044-floating-point
26s
Add single source of truth for absolute and relative differences to Mantid::Kernel::FloatingPointComparison Check for merge conflicts #14700: Pull request #37931 synchronize by rboston628
30s ewm5044-floating-point
ewm5044-floating-point
30s
Add single source of truth for absolute and relative differences to Mantid::Kernel::FloatingPointComparison Check for merge conflicts #14699: Pull request #37931 synchronize by rboston628
29s ewm5044-floating-point
ewm5044-floating-point
29s
37752 FindPeaksConvolve flaky Test fix Check for merge conflicts #14698: Pull request #37970 synchronize by warunawickramasingha
26s 37752_findpeaksconvolvetest_fix
37752_findpeaksconvolvetest_fix
26s
37752 FindPeaksConvolve flaky Test fix Check for merge conflicts #14697: Pull request #37970 synchronize by warunawickramasingha
29s 37752_findpeaksconvolvetest_fix
37752_findpeaksconvolvetest_fix
29s
37752 FindPeaksConvolve flaky Test fix Check for merge conflicts #14696: Pull request #37970 synchronize by warunawickramasingha
28s 37752_findpeaksconvolvetest_fix
37752_findpeaksconvolvetest_fix
28s
Update dev docs after setuptools update Check for merge conflicts #14695: Pull request #37976 opened by thomashampson
25s 37934_update_debugging_dev_docs
37934_update_debugging_dev_docs
25s
37752 FindPeaksConvolve flaky Test fix Check for merge conflicts #14694: Pull request #37970 synchronize by warunawickramasingha
28s 37752_findpeaksconvolvetest_fix
37752_findpeaksconvolvetest_fix
28s
Fix calculation of EISF errors in BayesQuasi algorithm Check for merge conflicts #14693: Pull request #37975 synchronize by robertapplin
27s robertapplin:37973-fix-calculation-of-eisf-error
robertapplin:37973-fix-calculation-of-eisf-error
27s
Fix calculation of EISF errors in BayesQuasi algorithm Check for merge conflicts #14692: Pull request #37975 opened by robertapplin
30s robertapplin:37973-fix-calculation-of-eisf-error
robertapplin:37973-fix-calculation-of-eisf-error
30s
Merge ornl-next into main Check for merge conflicts #14691: Commit bcc838a pushed by mantid-builder
27s main
main
27s
Create release notes for 6.12 Check for merge conflicts #14690: Commit 4b46bbb pushed by peterfpeterson
16s ornl-next
ornl-next
16s
37752 FindPeaksConvolve flaky Test fix Check for merge conflicts #14689: Pull request #37970 synchronize by warunawickramasingha
27s 37752_findpeaksconvolvetest_fix
37752_findpeaksconvolvetest_fix
27s
37752 FindPeaksConvolve flaky Test fix Check for merge conflicts #14688: Pull request #37970 synchronize by warunawickramasingha
28s 37752_findpeaksconvolvetest_fix
37752_findpeaksconvolvetest_fix
28s
37752 FindPeaksConvolve flaky Test fix Check for merge conflicts #14687: Pull request #37970 synchronize by warunawickramasingha
30s 37752_findpeaksconvolvetest_fix
37752_findpeaksconvolvetest_fix
30s
Merge ornl-next into main Check for merge conflicts #14686: Commit c100135 pushed by mantid-builder
27s main
main
27s
Merge release-next into main Check for merge conflicts #14685: Commit db3fa5f pushed by mantid-builder
28s main
main
28s
Merge release-next into ornl-next Check for merge conflicts #14684: Commit 7024892 pushed by mantid-builder
30s ornl-next
ornl-next
30s
Merge pull request #37966 from cailafinn/37939_correct_polarizer_effi… Check for merge conflicts #14683: Commit 74d457e pushed by SilkeSchomann
13s release-next
release-next
13s
Increase tolerance in HRPD system test due to suspected OS dependent fitting Check for merge conflicts #14682: Pull request #37972 synchronize by RichardWaiteSTFC
29s fix_HRPD_prompt_pulse_subtraction_system_test
fix_HRPD_prompt_pulse_subtraction_system_test
29s
Increase tolerance in HRPD system test due to suspected OS dependent fitting Check for merge conflicts #14681: Pull request #37972 opened by RichardWaiteSTFC
28s fix_HRPD_prompt_pulse_subtraction_system_test
fix_HRPD_prompt_pulse_subtraction_system_test
28s
Merge pull request #37968 from mantidproject/create_6_12_release_notes Check for merge conflicts #14680: Commit 88799c1 pushed by SilkeSchomann
27s main
main
27s
Remove prompt pulse Check for merge conflicts #14679: Pull request #37932 synchronize by dmitry-ganyushin
26s RemovePromptPulse
RemovePromptPulse
26s
Refactor HRPD prompt pulse subtraction for readability Check for merge conflicts #14678: Pull request #37971 opened by RichardWaiteSTFC
32s 37969_refactor_HRPD_prompt_pulse_subtraction_func_for_readability
37969_refactor_HRPD_prompt_pulse_subtraction_func_for_readability
32s
Merge ornl-next into main Check for merge conflicts #14677: Commit 7f4bdd5 pushed by mantid-builder
26s main
main
26s