Skip to content

Actions: mantidproject/mantid

Actions

Check for merge conflicts

Actions

Loading...

Show workflow options

Create status badge

label_merge_conflicts.yml
5,685 workflow runs
5,685 workflow runs
Event

Filter by event
Status

Filter by status
Branch
Actor

Filter by actor
Add log compression option to AlignAndFocusPowder Check for merge conflicts #12672: Pull request #37352 synchronize by rosswhitfield
May 14, 2024 02:46 28s rosswhitfield:AlignAndFocusPowder_compress_log
rosswhitfield:AlignAndFocusPowder_compress_log
May 14, 2024 02:46 28s
Add log compression option to AlignAndFocusPowder Check for merge conflicts #12671: Pull request #37352 opened by rosswhitfield
May 14, 2024 02:36 25s rosswhitfield:AlignAndFocusPowder_compress_log
rosswhitfield:AlignAndFocusPowder_compress_log
May 14, 2024 02:36 25s
[pre-commit.ci] pre-commit autoupdate Check for merge conflicts #12670: Pull request #37351 opened by pre-commit-ci bot
May 13, 2024 21:38 13s pre-commit-ci-update-config
pre-commit-ci-update-config
May 13, 2024 21:38 13s
Merge pull request #37319 from cailafinn/35085_wavelength_tooltips_ma… Check for merge conflicts #12669: Commit 51ce2dd pushed by rbauststfc
May 13, 2024 15:25 12s main
main
May 13, 2024 15:25 12s
Merge pull request #37320 from mantidproject/35829_documentation_for_… Check for merge conflicts #12668: Commit be53977 pushed by SilkeSchomann
May 13, 2024 15:25 45s main
main
May 13, 2024 15:25 45s
WIP: refactor Abins, replace SData with Euphonic data structures Check for merge conflicts #12667: Pull request #37350 opened by ajjackson
May 13, 2024 13:57 26s ajjackson:sdata-euphonic
ajjackson:sdata-euphonic
May 13, 2024 13:57 26s
Add documentation for build_packages_from_branch jenkins job Check for merge conflicts #12666: Pull request #37320 synchronize by jhaigh0
May 13, 2024 13:52 26s 35829_documentation_for_build_packages_from_branch
35829_documentation_for_build_packages_from_branch
May 13, 2024 13:52 26s
Don't run doc tests if only dev docs have changed Check for merge conflicts #12665: Pull request #37349 synchronize by jhaigh0
May 13, 2024 13:27 29s 37147_no_doc_tests_for_dev_docs
37147_no_doc_tests_for_dev_docs
May 13, 2024 13:27 29s
Don't run doc tests if only dev docs have changed Check for merge conflicts #12664: Pull request #37349 opened by jhaigh0
May 13, 2024 13:09 28s 37147_no_doc_tests_for_dev_docs
37147_no_doc_tests_for_dev_docs
May 13, 2024 13:09 28s
Add documentation for build_packages_from_branch jenkins job Check for merge conflicts #12663: Pull request #37320 synchronize by jhaigh0
May 13, 2024 12:26 27s 35829_documentation_for_build_packages_from_branch
35829_documentation_for_build_packages_from_branch
May 13, 2024 12:26 27s
Add documentation for build_packages_from_branch jenkins job Check for merge conflicts #12662: Pull request #37320 synchronize by jhaigh0
May 13, 2024 12:21 29s 35829_documentation_for_build_packages_from_branch
35829_documentation_for_build_packages_from_branch
May 13, 2024 12:21 29s
New algorithm to find multiple UB matrices in case of multiple domains or spurious peaks Check for merge conflicts #12661: Pull request #37309 synchronize by RichardWaiteSTFC
May 13, 2024 12:00 28s 35711_new_algorithm_to_find_multiple_UB
35711_new_algorithm_to_find_multiple_UB
May 13, 2024 12:00 28s
New algorithm to find multiple UB matrices in case of multiple domains or spurious peaks Check for merge conflicts #12660: Pull request #37309 synchronize by RichardWaiteSTFC
May 13, 2024 10:40 28s 35711_new_algorithm_to_find_multiple_UB
35711_new_algorithm_to_find_multiple_UB
May 13, 2024 10:40 28s
Remove unused include Check for merge conflicts #12659: Pull request #37310 synchronize by SilkeSchomann
May 13, 2024 10:35 30s 37308_fix_timeroi_to_unpin_libcxx
37308_fix_timeroi_to_unpin_libcxx
May 13, 2024 10:35 30s
Add documentation for build_packages_from_branch jenkins job Check for merge conflicts #12658: Pull request #37320 opened by jhaigh0
May 13, 2024 10:33 27s 35829_documentation_for_build_packages_from_branch
35829_documentation_for_build_packages_from_branch
May 13, 2024 10:33 27s
Add note to Manual Testing instructions about missing wavelength tooltips Check for merge conflicts #12657: Pull request #37319 synchronize by cailafinn
May 13, 2024 10:02 26s cailafinn:35085_wavelength_tooltips_man_test
cailafinn:35085_wavelength_tooltips_man_test
May 13, 2024 10:02 26s
Add note to Manual Testing instructions about missing wavelength tooltips Check for merge conflicts #12656: Pull request #37319 opened by cailafinn
May 13, 2024 09:33 25s cailafinn:35085_wavelength_tooltips_man_test
cailafinn:35085_wavelength_tooltips_man_test
May 13, 2024 09:33 25s
New algorithm to find multiple UB matrices in case of multiple domains or spurious peaks Check for merge conflicts #12655: Pull request #37309 synchronize by RichardWaiteSTFC
May 13, 2024 09:15 26s 35711_new_algorithm_to_find_multiple_UB
35711_new_algorithm_to_find_multiple_UB
May 13, 2024 09:15 26s
Remove unused include Check for merge conflicts #12654: Pull request #37310 synchronize by SilkeSchomann
May 13, 2024 07:31 27s 37308_fix_timeroi_to_unpin_libcxx
37308_fix_timeroi_to_unpin_libcxx
May 13, 2024 07:31 27s
Merge pull request #37317 from mantidproject/37288_models_into_manipu… Check for merge conflicts #12653: Commit 0e1ac9c pushed by SilkeSchomann
May 13, 2024 06:58 27s main
main
May 13, 2024 06:58 27s
Merge ornl-next into main Check for merge conflicts #12652: Commit 6c791ea pushed by mantid-builder
May 10, 2024 21:35 26s main
main
May 10, 2024 21:35 26s
Merge release-next into ornl-next Check for merge conflicts #12651: Commit 24c4ffc pushed by mantid-builder
May 10, 2024 21:34 9s ornl-next
ornl-next
May 10, 2024 21:34 9s
Merge release-next into main Check for merge conflicts #12650: Commit f2b8b49 pushed by mantid-builder
May 10, 2024 21:34 26s main
main
May 10, 2024 21:34 26s
Merge pull request #37314 from rosswhitfield/disable_replace_ws_button Check for merge conflicts #12649: Commit 2d38088 pushed by peterfpeterson
May 10, 2024 21:34 13s release-next
release-next
May 10, 2024 21:34 13s
New algorithm to find multiple UB matrices in case of multiple domains or spurious peaks Check for merge conflicts #12648: Pull request #37309 synchronize by RichardWaiteSTFC
May 10, 2024 16:21 28s 35711_new_algorithm_to_find_multiple_UB
35711_new_algorithm_to_find_multiple_UB
May 10, 2024 16:21 28s