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 #15379: Pull request #38193 synchronize by robertapplin
October 17, 2024 15:58 28s 0-wild-imports2
0-wild-imports2
October 17, 2024 15:58 28s
Remove wild imports in Framework and Testing directories Check for merge conflicts #15378: Pull request #38193 synchronize by robertapplin
October 17, 2024 15:29 26s 0-wild-imports2
0-wild-imports2
October 17, 2024 15:29 26s
Final changes for release notes 6.11 Check for merge conflicts #15377: Pull request #38208 opened by GuiMacielPereira
October 17, 2024 15:29 29s release-notes-6.11-final-changes
release-notes-6.11-final-changes
October 17, 2024 15:29 29s
Remove wild imports in Framework and Testing directories Check for merge conflicts #15376: Pull request #38193 synchronize by robertapplin
October 17, 2024 15:04 27s 0-wild-imports2
0-wild-imports2
October 17, 2024 15:04 27s
Merge pull request #38195 from mantidproject/38104_PhaseTablePresente… Check for merge conflicts #15375: Commit 0b2ff14 pushed by robertapplin
October 17, 2024 15:01 26s main
main
October 17, 2024 15:01 26s
Merge pull request #38169 from mantidproject/check_for_stderr_on_startup Check for merge conflicts #15374: Commit adf60cf pushed by SilkeSchomann
October 17, 2024 14:54 29s main
main
October 17, 2024 14:54 29s
Keep most recent successful nightly Check for merge conflicts #15373: Pull request #38207 opened by thomashampson
October 17, 2024 14:31 30s 38147_keep_most_recent_successful_nightly
38147_keep_most_recent_successful_nightly
October 17, 2024 14:31 30s
Add value attribute to python binding of Property base class Check for merge conflicts #15372: Pull request #38206 opened by rboston628
October 17, 2024 13:53 27s ewm7509-property-value
ewm7509-property-value
October 17, 2024 13:53 27s
Remove wild imports in Framework and Testing directories Check for merge conflicts #15371: Pull request #38193 synchronize by robertapplin
October 17, 2024 13:50 28s 0-wild-imports2
0-wild-imports2
October 17, 2024 13:50 28s
Remove wild imports in Framework and Testing directories Check for merge conflicts #15370: Pull request #38193 synchronize by robertapplin
October 17, 2024 13:17 26s 0-wild-imports2
0-wild-imports2
October 17, 2024 13:17 26s
Remove qobject dependency from baselinemodelling model and presenter Check for merge conflicts #15369: Pull request #38205 synchronize by jhaigh0
October 17, 2024 13:16 28s 38008_baselinefittingpresenter_changes
38008_baselinefittingpresenter_changes
October 17, 2024 13:16 28s
Move logic out of GroupingTabWidget Check for merge conflicts #15368: Pull request #38200 synchronize by thomashampson
October 17, 2024 12:43 29s 38103_logic_groupingtabwidgetview
38103_logic_groupingtabwidgetview
October 17, 2024 12:43 29s
Add phase table model Check for merge conflicts #15367: Pull request #38195 synchronize by rbauststfc
October 17, 2024 12:27 28s 38104_PhaseTablePresenter_cleanup
38104_PhaseTablePresenter_cleanup
October 17, 2024 12:27 28s
Remove qobject dependency from baselinemodelling model and presenter Check for merge conflicts #15366: Pull request #38205 synchronize by jhaigh0
October 17, 2024 12:27 29s 38008_baselinefittingpresenter_changes
38008_baselinefittingpresenter_changes
October 17, 2024 12:27 29s
Merge ornl-next into main Check for merge conflicts #15365: Commit a320fe8 pushed by mantid-builder
October 17, 2024 09:59 28s main
main
October 17, 2024 09:59 28s
Merge release-next into ornl-next Check for merge conflicts #15364: Commit 789f91e pushed by mantid-builder
October 17, 2024 09:59 31s ornl-next
ornl-next
October 17, 2024 09:59 31s
Merge release-next into main Check for merge conflicts #15363: Commit 6763c41 pushed by mantid-builder
October 17, 2024 09:59 30s main
main
October 17, 2024 09:59 30s
Merge pull request #38194 from mantidproject/38182_phase_fix_pychop Check for merge conflicts #15362: Commit e4fb690 pushed by thomashampson
October 17, 2024 09:58 27s release-next
release-next
October 17, 2024 09:58 27s
Remove qobject dependency from baselinemodelling model and presenter Check for merge conflicts #15361: Pull request #38205 synchronize by jhaigh0
October 17, 2024 09:30 30s 38008_baselinefittingpresenter_changes
38008_baselinefittingpresenter_changes
October 17, 2024 09:30 30s
Add phase table model Check for merge conflicts #15360: Pull request #38195 synchronize by jhaigh0
October 17, 2024 09:25 27s 38104_PhaseTablePresenter_cleanup
38104_PhaseTablePresenter_cleanup
October 17, 2024 09:25 27s
Remove qobject dependency from baselinemodelling model and presenter Check for merge conflicts #15359: Pull request #38205 synchronize by jhaigh0
October 17, 2024 09:11 30s 38008_baselinefittingpresenter_changes
38008_baselinefittingpresenter_changes
October 17, 2024 09:11 30s
Remove qobject dependency from baselinemodelling model and presenter Check for merge conflicts #15358: Pull request #38205 opened by jhaigh0
October 17, 2024 09:02 26s 38008_baselinefittingpresenter_changes
38008_baselinefittingpresenter_changes
October 17, 2024 09:02 26s
Output Build Logs to a File for the Jenkins Warnings Plugin Check for merge conflicts #15357: Pull request #38153 synchronize by cailafinn
October 17, 2024 08:40 29s cailafinn:38148_unstable_builds_on_flaky_tests
cailafinn:38148_unstable_builds_on_flaky_tests
October 17, 2024 08:40 29s
Fix for incorrect incident energies for Merlin in PyChop Check for merge conflicts #15356: Pull request #38194 synchronize by SilkeSchomann
October 17, 2024 08:34 28s 38182_phase_fix_pychop
38182_phase_fix_pychop
October 17, 2024 08:34 28s
Merge ornl-next into main Check for merge conflicts #15355: Commit 2f6d9b1 pushed by mantid-builder
October 17, 2024 08:04 25s main
main
October 17, 2024 08:04 25s