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
2,584 workflow run results
2,584 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Python Help Window Prototype to remove qtassistant Check for merge conflicts #16850: Pull request #38499 synchronize by darshdinger
27s 37248-remove-qtassistant-and-reduce-size-of-mantiddocs-package
37248-remove-qtassistant-and-reduce-size-of-mantiddocs-package
27s
Remove includes of MantidKernel/System.h Check for merge conflicts #16849: Pull request #38573 synchronize by peterfpeterson
24s peterfpeterson:38457_generate_export_header
peterfpeterson:38457_generate_export_header
24s
Python Help Window Prototype to remove qtassistant Check for merge conflicts #16848: Pull request #38499 synchronize by darshdinger
28s 37248-remove-qtassistant-and-reduce-size-of-mantiddocs-package
37248-remove-qtassistant-and-reduce-size-of-mantiddocs-package
28s
Python Help Window Prototype to remove qtassistant Check for merge conflicts #16847: Pull request #38499 synchronize by darshdinger
23s 37248-remove-qtassistant-and-reduce-size-of-mantiddocs-package
37248-remove-qtassistant-and-reduce-size-of-mantiddocs-package
23s
Python Help Window Prototype to remove qtassistant Check for merge conflicts #16846: Pull request #38499 synchronize by darshdinger
25s 37248-remove-qtassistant-and-reduce-size-of-mantiddocs-package
37248-remove-qtassistant-and-reduce-size-of-mantiddocs-package
25s
Python Help Window Prototype to remove qtassistant Check for merge conflicts #16845: Pull request #38499 synchronize by darshdinger
24s 37248-remove-qtassistant-and-reduce-size-of-mantiddocs-package
37248-remove-qtassistant-and-reduce-size-of-mantiddocs-package
24s
Python Help Window Prototype to remove qtassistant Check for merge conflicts #16844: Pull request #38499 synchronize by darshdinger
24s 37248-remove-qtassistant-and-reduce-size-of-mantiddocs-package
37248-remove-qtassistant-and-reduce-size-of-mantiddocs-package
24s
Python Help Window Prototype to remove qtassistant Check for merge conflicts #16843: Pull request #38499 synchronize by darshdinger
24s 37248-remove-qtassistant-and-reduce-size-of-mantiddocs-package
37248-remove-qtassistant-and-reduce-size-of-mantiddocs-package
24s
Python Help Window Prototype to remove qtassistant Check for merge conflicts #16842: Pull request #38499 synchronize by darshdinger
27s 37248-remove-qtassistant-and-reduce-size-of-mantiddocs-package
37248-remove-qtassistant-and-reduce-size-of-mantiddocs-package
27s
Python Help Window Prototype to remove qtassistant Check for merge conflicts #16841: Pull request #38499 synchronize by darshdinger
25s 37248-remove-qtassistant-and-reduce-size-of-mantiddocs-package
37248-remove-qtassistant-and-reduce-size-of-mantiddocs-package
25s
Python Help Window Prototype to remove qtassistant Check for merge conflicts #16840: Pull request #38499 synchronize by darshdinger
25s 37248-remove-qtassistant-and-reduce-size-of-mantiddocs-package
37248-remove-qtassistant-and-reduce-size-of-mantiddocs-package
25s
Python Help Window Prototype to remove qtassistant Check for merge conflicts #16839: Pull request #38499 synchronize by darshdinger
25s 37248-remove-qtassistant-and-reduce-size-of-mantiddocs-package
37248-remove-qtassistant-and-reduce-size-of-mantiddocs-package
25s
Python Help Window Prototype to remove qtassistant Check for merge conflicts #16837: Pull request #38499 reopened by darshdinger
25s 37248-remove-qtassistant-and-reduce-size-of-mantiddocs-package
37248-remove-qtassistant-and-reduce-size-of-mantiddocs-package
25s
Python Help Window Prototype to remove qtassistant Check for merge conflicts #16838: Pull request #38499 synchronize by darshdinger
26s 37248-remove-qtassistant-and-reduce-size-of-mantiddocs-package
37248-remove-qtassistant-and-reduce-size-of-mantiddocs-package
26s
AlignAndFocusPowderSlim prototype Check for merge conflicts #16836: Pull request #38279 synchronize by peterfpeterson
25s peterfpeterson:ewm6343_aafpff_slim
peterfpeterson:ewm6343_aafpff_slim
25s
Parial move of reflectometry gui to std::optional Check for merge conflicts #16835: Pull request #38545 synchronize by peterfpeterson
28s peterfpeterson:37875_boost_optional
peterfpeterson:37875_boost_optional
28s
Remove includes of MantidKernel/System.h Check for merge conflicts #16834: Pull request #38573 opened by peterfpeterson
29s peterfpeterson:38457_generate_export_header
peterfpeterson:38457_generate_export_header
29s
Merge ornl-next into main Check for merge conflicts #16833: Commit 2319044 pushed by mantid-builder
29s main
main
29s
Merge pull request #38572 from peterfpeterson/abins-scipy-constants-o… Check for merge conflicts #16832: Commit 1701172 pushed by peterfpeterson
15s ornl-next
ornl-next
15s
Merge ornl-next into main Check for merge conflicts #16831: Commit bf7e14c pushed by mantid-builder
27s main
main
27s
Merge pull request #38571 from peterfpeterson/ewm8789_convert_units_r… Check for merge conflicts #16830: Commit 3a41a4c pushed by peterfpeterson
30s ornl-next
ornl-next
30s
AlignAndFocusPowderSlim prototype Check for merge conflicts #16829: Pull request #38279 synchronize by peterfpeterson
28s peterfpeterson:ewm6343_aafpff_slim
peterfpeterson:ewm6343_aafpff_slim
28s
Merge ornl-next into main Check for merge conflicts #16828: Commit 1fd2007 pushed by mantid-builder
31s main
main
31s
Merge pull request #38570 from peterfpeterson/38437_fix_cmake_warning… Check for merge conflicts #16827: Commit fcd49ba pushed by peterfpeterson
28s ornl-next
ornl-next
28s
Merge ornl-next into main Check for merge conflicts #16826: Commit a601516 pushed by mantid-builder
30s main
main
30s