Skip to content

Actions: mantidproject/mantid

Actions

Check for merge conflicts

Actions

Loading...

Show workflow options

Create status badge

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

Filter by event
Status

Filter by status
Branch
Actor

Filter by actor
Merge pull request #37408 from rosswhitfield/fix_CompressEvents_log_bug Check for merge conflicts #12841: Commit c051fd8 pushed by KedoKudo
May 24, 2024 13:26 27s release-next
release-next
May 24, 2024 13:26 27s
Merge release-next into ornl-next Check for merge conflicts #12840: Commit acef66e pushed by mantid-builder
May 24, 2024 13:19 12s ornl-next
ornl-next
May 24, 2024 13:19 12s
Merge pull request #37412 from robertapplin/37409-fix-indirect-data-r… Check for merge conflicts #12839: Commit eb05bdb pushed by SilkeSchomann
May 24, 2024 13:19 27s release-next
release-next
May 24, 2024 13:19 27s
Create RunWidget for Indirect/Inelastic interfaces Check for merge conflicts #12838: Pull request #37391 synchronize by robertapplin
May 24, 2024 13:10 28s robertapplin:37381-implement-run-widget
robertapplin:37381-implement-run-widget
May 24, 2024 13:10 28s
Merge pull request #37414 from robertapplin/0-fix-coverity-warnings Check for merge conflicts #12837: Commit 840f2dc pushed by SilkeSchomann
May 24, 2024 12:57 27s main
main
May 24, 2024 12:57 27s
Add deprecation message to Calculate Paalman Pings to get user feedback Check for merge conflicts #12836: Pull request #37419 synchronize by robertapplin
May 24, 2024 12:55 26s robertapplin:0-deprecate-calculate-paalman-pings
robertapplin:0-deprecate-calculate-paalman-pings
May 24, 2024 12:55 26s
WIP: refactor Abins, replace SData with Euphonic data structures Check for merge conflicts #12835: Pull request #37350 synchronize by ajjackson
May 24, 2024 12:10 26s ajjackson:sdata-euphonic
ajjackson:sdata-euphonic
May 24, 2024 12:10 26s
Fix Indirect Data Reduction crash when open/close interface multiple times Check for merge conflicts #12834: Pull request #37412 synchronize by robertapplin
May 24, 2024 11:31 27s robertapplin:37409-fix-indirect-data-reduction-crash
robertapplin:37409-fix-indirect-data-reduction-crash
May 24, 2024 11:31 27s
Add deprecation message to Calculate Paalman Pings to get user feedback Check for merge conflicts #12833: Pull request #37419 synchronize by robertapplin
May 24, 2024 11:21 25s robertapplin:0-deprecate-calculate-paalman-pings
robertapplin:0-deprecate-calculate-paalman-pings
May 24, 2024 11:21 25s
Fix instrument data cache for ENGINX Check for merge conflicts #12832: Pull request #37420 opened by GuiMacielPereira
May 24, 2024 10:45 26s 37398-fix-search-for-engin-x-files-in-the-instrument-data-cache
37398-fix-search-for-engin-x-files-in-the-instrument-data-cache
May 24, 2024 10:45 26s
Add deprecation message to Calculate Paalman Pings to get user feedback Check for merge conflicts #12831: Pull request #37419 synchronize by robertapplin
May 24, 2024 09:40 25s robertapplin:0-deprecate-calculate-paalman-pings
robertapplin:0-deprecate-calculate-paalman-pings
May 24, 2024 09:40 25s
Add deprecation message to Calculate Paalman Pings to get user feedback Check for merge conflicts #12830: Pull request #37419 opened by robertapplin
May 24, 2024 09:36 30s robertapplin:0-deprecate-calculate-paalman-pings
robertapplin:0-deprecate-calculate-paalman-pings
May 24, 2024 09:36 30s
Improve test code for PolarizationCorrectionWildes Check for merge conflicts #12829: Pull request #37403 synchronize by jclarkeSTFC
May 24, 2024 09:33 28s jclarkeSTFC:37294_improve_wildes_test_code
jclarkeSTFC:37294_improve_wildes_test_code
May 24, 2024 09:33 28s
Merge branch 'release-next' Check for merge conflicts #12828: Commit b290943 pushed by robertapplin
May 24, 2024 08:15 26s main
main
May 24, 2024 08:15 26s
Move plotting in FitTab to plot presenter Check for merge conflicts #12827: Pull request #37388 synchronize by robertapplin
May 24, 2024 07:58 26s robertapplin:36390-refactor-fit-tab
robertapplin:36390-refactor-fit-tab
May 24, 2024 07:58 26s
Merge release-next into ornl-next Check for merge conflicts #12826: Commit 80f604f pushed by mantid-builder
May 24, 2024 07:47 10s ornl-next
ornl-next
May 24, 2024 07:47 10s
Merge pull request #37404 from mantidproject/symmetrise_bug Check for merge conflicts #12825: Commit 645b183 pushed by SilkeSchomann
May 24, 2024 07:46 28s release-next
release-next
May 24, 2024 07:46 28s
Fix coverity scan warnings in Indirect/Inelastic Check for merge conflicts #12824: Pull request #37414 opened by robertapplin
May 24, 2024 07:29 25s robertapplin:0-fix-coverity-warnings
robertapplin:0-fix-coverity-warnings
May 24, 2024 07:29 25s
Add filter bad pulses functionality to LoadEventNexus Check for merge conflicts #12823: Pull request #37406 synchronize by rosswhitfield
May 24, 2024 03:22 26s rosswhitfield:LoadEventNexus_FilterBadPulses
rosswhitfield:LoadEventNexus_FilterBadPulses
May 24, 2024 03:22 26s
Add filter bad pulses functionality to LoadEventNexus Check for merge conflicts #12822: Pull request #37406 synchronize by rosswhitfield
May 24, 2024 03:14 27s rosswhitfield:LoadEventNexus_FilterBadPulses
rosswhitfield:LoadEventNexus_FilterBadPulses
May 24, 2024 03:14 27s
Make AddAbsorptionWeightedPathLengths work for lean peaks Check for merge conflicts #12821: Pull request #37407 synchronize by zjmorgan
May 23, 2024 22:21 26s sample_absorption_lean_peaks
sample_absorption_lean_peaks
May 23, 2024 22:21 26s
Fix Indirect Data Reduction crash when open/close interface multiple times Check for merge conflicts #12820: Pull request #37412 synchronize by robertapplin
May 23, 2024 17:22 27s robertapplin:37409-fix-indirect-data-reduction-crash
robertapplin:37409-fix-indirect-data-reduction-crash
May 23, 2024 17:22 27s
WIP: refactor Abins, replace SData with Euphonic data structures Check for merge conflicts #12819: Pull request #37350 synchronize by ajjackson
May 23, 2024 16:04 27s ajjackson:sdata-euphonic
ajjackson:sdata-euphonic
May 23, 2024 16:04 27s
Fix Indirect Data Reduction crash when open/close interface multiple times Check for merge conflicts #12818: Pull request #37412 synchronize by robertapplin
May 23, 2024 14:17 29s robertapplin:37409-fix-indirect-data-reduction-crash
robertapplin:37409-fix-indirect-data-reduction-crash
May 23, 2024 14:17 29s
Fix Indirect Data Reduction crash when open/close interface multiple times Check for merge conflicts #12817: Pull request #37412 synchronize by robertapplin
May 23, 2024 14:03 27s robertapplin:37409-fix-indirect-data-reduction-crash
robertapplin:37409-fix-indirect-data-reduction-crash
May 23, 2024 14:03 27s