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
5,404 workflow run results
5,404 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge release-next into ornl-next Check for merge conflicts #15354: Commit 6f14393 pushed by mantid-builder
October 17, 2024 08:04 15s ornl-next
ornl-next
October 17, 2024 08:04 15s
Merge release-next into main Check for merge conflicts #15353: Commit f43b714 pushed by mantid-builder
October 17, 2024 08:04 27s main
main
October 17, 2024 08:04 27s
Merge pull request #38199 from mantidproject/mslice_sha_update_6_11 Check for merge conflicts #15352: Commit 922aab3 pushed by thomashampson
October 17, 2024 08:03 28s release-next
release-next
October 17, 2024 08:03 28s
Merge pull request #38126 from peterfpeterson/precommit_clangformat Check for merge conflicts #15351: Commit 79db5db pushed by AndreiSavici
October 16, 2024 18:04 33s main
main
October 16, 2024 18:04 33s
Merge ornl-next into main Check for merge conflicts #15350: Commit 2406285 pushed by mantid-builder
October 16, 2024 16:47 51s main
main
October 16, 2024 16:47 51s
AlgoTimeRegister addtime/Init export to python - ornl-next (#38190) Check for merge conflicts #15349: Commit 717634c pushed by mpatrou
October 16, 2024 16:47 13s ornl-next
ornl-next
October 16, 2024 16:47 13s
Remove wild imports in Framework and Testing directories Check for merge conflicts #15348: Pull request #38193 synchronize by robertapplin
October 16, 2024 14:48 28s 0-wild-imports2
0-wild-imports2
October 16, 2024 14:48 28s
Merge ornl-next into main Check for merge conflicts #15347: Commit 67ce147 pushed by mantid-builder
October 16, 2024 13:57 26s main
main
October 16, 2024 13:57 26s
Merge release-next into ornl-next Check for merge conflicts #15346: Commit 59905c8 pushed by mantid-builder
October 16, 2024 13:56 46s ornl-next
ornl-next
October 16, 2024 13:56 46s
Merge release-next into main Check for merge conflicts #15345: Commit a08f417 pushed by mantid-builder
October 16, 2024 13:56 27s main
main
October 16, 2024 13:56 27s
Merge pull request #38129 from mantidproject/release-next-6-11 Check for merge conflicts #15344: Commit 4a0cabd pushed by thomashampson
October 16, 2024 13:56 27s release-next
release-next
October 16, 2024 13:56 27s
Replace relative and absolute differences with new operations Check for merge conflicts #15343: Pull request #38067 synchronize by rboston628
October 16, 2024 13:30 28s ewm7196-replace-comparisons
ewm7196-replace-comparisons
October 16, 2024 13:30 28s
Remove wild imports in Framework and Testing directories Check for merge conflicts #15342: Pull request #38193 synchronize by robertapplin
October 16, 2024 12:57 30s 0-wild-imports2
0-wild-imports2
October 16, 2024 12:57 30s
Remove wild imports in Framework and Testing directories Check for merge conflicts #15341: Pull request #38193 synchronize by robertapplin
October 16, 2024 12:30 30s 0-wild-imports2
0-wild-imports2
October 16, 2024 12:30 30s
Remove wild imports in Framework and Testing directories Check for merge conflicts #15339: Pull request #38193 synchronize by robertapplin
October 16, 2024 11:16 27s 0-wild-imports2
0-wild-imports2
October 16, 2024 11:16 27s
Remove wild imports in Framework and Testing directories Check for merge conflicts #15338: Pull request #38193 synchronize by robertapplin
October 16, 2024 10:53 25s 0-wild-imports2
0-wild-imports2
October 16, 2024 10:53 25s
Remove wild imports in Framework and Testing directories Check for merge conflicts #15337: Pull request #38193 synchronize by robertapplin
October 16, 2024 10:26 26s 0-wild-imports2
0-wild-imports2
October 16, 2024 10:26 26s
Remove wild imports in Framework and Testing directories Check for merge conflicts #15336: Pull request #38193 synchronize by robertapplin
October 16, 2024 10:01 29s 0-wild-imports2
0-wild-imports2
October 16, 2024 10:01 29s
Pin freeimage in conda environments Check for merge conflicts #15335: Pull request #38201 synchronize by thomashampson
October 16, 2024 09:46 30s pin_freeimage
pin_freeimage
October 16, 2024 09:46 30s
Pin freeimage in conda environments Check for merge conflicts #15334: Pull request #38201 opened by thomashampson
October 16, 2024 09:26 25s pin_freeimage
pin_freeimage
October 16, 2024 09:26 25s
Remove wild imports in Framework and Testing directories Check for merge conflicts #15333: Pull request #38193 synchronize by robertapplin
October 16, 2024 09:24 27s 0-wild-imports2
0-wild-imports2
October 16, 2024 09:24 27s
Move logic out of GroupingTabWidget Check for merge conflicts #15332: Pull request #38200 opened by MohamedAlmaki
October 16, 2024 08:57 30s 38103_logic_groupingtabwidgetview
38103_logic_groupingtabwidgetview
October 16, 2024 08:57 30s
Remove wild imports in Framework and Testing directories Check for merge conflicts #15331: Pull request #38193 synchronize by robertapplin
October 16, 2024 08:38 29s 0-wild-imports2
0-wild-imports2
October 16, 2024 08:38 29s
Updated MSlice SHA and added release notes Check for merge conflicts #15330: Pull request #38199 synchronize by SilkeSchomann
October 16, 2024 07:43 31s mslice_sha_update_6_11
mslice_sha_update_6_11
October 16, 2024 07:43 31s
Updated MSlice SHA and added release notes Check for merge conflicts #15329: Pull request #38199 opened by SilkeSchomann
October 16, 2024 07:41 27s mslice_sha_update_6_11
mslice_sha_update_6_11
October 16, 2024 07:41 27s