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

Remove wild imports in Framework and Testing directories Check for merge conflicts #15404: Pull request #38193 synchronize by robertapplin
October 18, 2024 15:03 47s 0-wild-imports2
0-wild-imports2
October 18, 2024 15:03 47s
Final changes for release notes 6.11 Check for merge conflicts #15403: Pull request #38208 synchronize by thomashampson
October 18, 2024 13:53 28s release-notes-6.11-final-changes
release-notes-6.11-final-changes
October 18, 2024 13:53 28s
Final changes for release notes 6.11 Check for merge conflicts #15402: Pull request #38208 synchronize by thomashampson
October 18, 2024 13:10 31s release-notes-6.11-final-changes
release-notes-6.11-final-changes
October 18, 2024 13:10 31s
Remove wild imports in Framework and Testing directories Check for merge conflicts #15401: Pull request #38193 synchronize by robertapplin
October 18, 2024 12:44 28s 0-wild-imports2
0-wild-imports2
October 18, 2024 12:44 28s
Remove wild imports in Framework and Testing directories Check for merge conflicts #15400: Pull request #38193 synchronize by robertapplin
October 18, 2024 11:36 26s 0-wild-imports2
0-wild-imports2
October 18, 2024 11:36 26s
Remove wild imports in Framework and Testing directories Check for merge conflicts #15399: Pull request #38193 synchronize by robertapplin
October 18, 2024 11:00 29s 0-wild-imports2
0-wild-imports2
October 18, 2024 11:00 29s
Final changes for release notes 6.11 Check for merge conflicts #15398: Pull request #38208 reopened by GuiMacielPereira
October 18, 2024 10:55 28s release-notes-6.11-final-changes
release-notes-6.11-final-changes
October 18, 2024 10:55 28s
Final changes for release notes 6.11 Check for merge conflicts #15397: Pull request #38208 synchronize by GuiMacielPereira
October 18, 2024 10:48 27s release-notes-6.11-final-changes
release-notes-6.11-final-changes
October 18, 2024 10:48 27s
Remove wild imports in Framework and Testing directories Check for merge conflicts #15396: Pull request #38193 synchronize by robertapplin
October 18, 2024 10:36 29s 0-wild-imports2
0-wild-imports2
October 18, 2024 10:36 29s
Merge pull request #38200 from mantidproject/38103_logic_groupingtabw… Check for merge conflicts #15395: Commit 6529ef8 pushed by robertapplin
October 18, 2024 08:33 29s main
main
October 18, 2024 08:33 29s
Remove direct calls to presenter from cut viewer view Check for merge conflicts #15394: Pull request #38197 synchronize by RichardWaiteSTFC
October 18, 2024 08:25 27s 38102_view_not_to_call_presenter_methods_directly
38102_view_not_to_call_presenter_methods_directly
October 18, 2024 08:25 27s
Remove direct calls to presenter from cut viewer view Check for merge conflicts #15393: Pull request #38197 synchronize by RichardWaiteSTFC
October 17, 2024 19:09 27s 38102_view_not_to_call_presenter_methods_directly
38102_view_not_to_call_presenter_methods_directly
October 17, 2024 19:09 27s
Extracted Logic in Pairing Table View to Presenter Check for merge conflicts #15392: Pull request #38213 opened by yusufjimoh
October 17, 2024 18:09 28s 38105-logic-in-the-pairingtableview
38105-logic-in-the-pairingtableview
October 17, 2024 18:09 28s
Merge ornl-next into main Check for merge conflicts #15391: Commit 0a22147 pushed by mantid-builder
October 17, 2024 17:52 26s main
main
October 17, 2024 17:52 26s
Merge pull request #38209 from peterfpeterson/precommit_clangformat_o… Check for merge conflicts #15390: Commit b4ff329 pushed by peterfpeterson
October 17, 2024 17:52 17s ornl-next
ornl-next
October 17, 2024 17:52 17s
ALCDataLoadingPresenter no longer a QObject and introducing new model Check for merge conflicts #15389: Pull request #38212 opened by GuiMacielPereira
October 17, 2024 17:24 29s alcdataloadingpresenter-qobject
alcdataloadingpresenter-qobject
October 17, 2024 17:24 29s
Remove QObjects from ALCFitting Presenter and Model Check for merge conflicts #15388: Pull request #38211 synchronize by cailafinn
October 17, 2024 17:08 30s cailafinn:38007_fitting_presenter_qobject
cailafinn:38007_fitting_presenter_qobject
October 17, 2024 17:08 30s
Remove QObjects from ALCFitting Presenter and Model Check for merge conflicts #15387: Pull request #38211 opened by cailafinn
October 17, 2024 17:04 29s cailafinn:38007_fitting_presenter_qobject
cailafinn:38007_fitting_presenter_qobject
October 17, 2024 17:04 29s
Final changes for release notes 6.11 Check for merge conflicts #15386: Pull request #38208 synchronize by GuiMacielPereira
October 17, 2024 16:44 27s release-notes-6.11-final-changes
release-notes-6.11-final-changes
October 17, 2024 16:44 27s
pre-commit.ci run clang-format - ornl-next Check for merge conflicts #15385: Pull request #38209 opened by peterfpeterson
October 17, 2024 16:02 26s peterfpeterson:precommit_clangformat_ornlnext
peterfpeterson:precommit_clangformat_ornlnext
October 17, 2024 16:02 26s
Merge ornl-next into main Check for merge conflicts #15384: Commit b05c608 pushed by mantid-builder
October 17, 2024 15:59 31s main
main
October 17, 2024 15:59 31s
Merge release-next into ornl-next Check for merge conflicts #15383: Commit 4e1f0f6 pushed by mantid-builder
October 17, 2024 15:59 10s ornl-next
ornl-next
October 17, 2024 15:59 10s
Update dev docs after setuptools update Check for merge conflicts #15382: Pull request #37976 synchronize by cailafinn
October 17, 2024 15:59 26s 37934_update_debugging_dev_docs
37934_update_debugging_dev_docs
October 17, 2024 15:59 26s
Merge release-next into main Check for merge conflicts #15381: Commit 034ca14 pushed by mantid-builder
October 17, 2024 15:59 28s main
main
October 17, 2024 15:59 28s
Merge pull request #38153 from cailafinn/38148_unstable_builds_on_fla… Check for merge conflicts #15380: Commit 1463b07 pushed by robertapplin
October 17, 2024 15:58 27s release-next
release-next
October 17, 2024 15:58 27s