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
3,131 workflow run results
3,131 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

[pre-commit.ci] pre-commit autoupdate Check for merge conflicts #17122: Pull request #38625 opened by pre-commit-ci bot
25s pre-commit-ci-update-config
pre-commit-ci-update-config
25s
Create Monte Carlo Workspace Algorithm Check for merge conflicts #17121: Pull request #38341 synchronize by Despiix
25s Create_Monte_Carlo_Ws
Create_Monte_Carlo_Ws
25s
Capture c++ stack traces from core dump files on linux Check for merge conflicts #17120: Pull request #38600 synchronize by jhaigh0
27s 38405_capture_cpp_stacktraces_from_core_dumps
38405_capture_cpp_stacktraces_from_core_dumps
27s
Merge release-next into main Check for merge conflicts #17119: Commit 0d952f8 pushed by mantid-builder
30s main
main
30s
Merge pull request #38605 from mantidproject/fix_save_ins Check for merge conflicts #17118: Commit b78002e pushed by SilkeSchomann
26s release-next
release-next
26s
Abins: explicit cache directory management Check for merge conflicts #17117: Pull request #38620 synchronize by ajjackson
26s ajjackson:abins-cache-dir
ajjackson:abins-cache-dir
26s
Capture c++ stack traces from core dump files on linux Check for merge conflicts #17116: Pull request #38600 synchronize by jhaigh0
27s 38405_capture_cpp_stacktraces_from_core_dumps
38405_capture_cpp_stacktraces_from_core_dumps
27s
Remove symmetry elements for SaveINS Check for merge conflicts #17115: Pull request #38605 synchronize by zjmorgan
26s fix_save_ins
fix_save_ins
26s
Abins: explicit cache directory management Check for merge conflicts #17114: Pull request #38620 synchronize by ajjackson
29s ajjackson:abins-cache-dir
ajjackson:abins-cache-dir
29s
Surface Plotting from Multiple Single-Spectrum Workspaces Check for merge conflicts #17113: Pull request #38599 synchronize by Despiix
29s 3D-plot-with-one-spectra
3D-plot-with-one-spectra
29s
Abins: explicit cache directory management Check for merge conflicts #17112: Pull request #38620 synchronize by ajjackson
30s ajjackson:abins-cache-dir
ajjackson:abins-cache-dir
30s
Merge release-next into main Check for merge conflicts #17111: Commit c391a4e pushed by mantid-builder
26s main
main
26s
Merge pull request #38619 from mantidproject/fix_conjoin_workspaces_bug Check for merge conflicts #17110: Commit 48117b6 pushed by jclarkeSTFC
29s release-next
release-next
29s
Merge pull request #38545 from peterfpeterson/37875_boost_optional Check for merge conflicts #17109: Commit 29a826d pushed by SilkeSchomann
27s main
main
27s
AlignAndFocusPowderSlim prototype Check for merge conflicts #17108: Pull request #38279 synchronize by peterfpeterson
26s peterfpeterson:ewm6343_aafpff_slim
peterfpeterson:ewm6343_aafpff_slim
26s
Merge ornl-next into main Check for merge conflicts #17107: Commit 7a4fb38 pushed by mantid-builder
27s main
main
27s
Merge pull request #38624 from peterfpeterson/windows_suppress_warnings Check for merge conflicts #17106: Commit 7848bea pushed by peterfpeterson
26s ornl-next
ornl-next
26s
Parial move of reflectometry gui to std::optional Check for merge conflicts #17105: Pull request #38545 synchronize by peterfpeterson
26s peterfpeterson:37875_boost_optional
peterfpeterson:37875_boost_optional
26s
Remove eroneously added release note Check for merge conflicts #17104: Commit 526ecf4 pushed by peterfpeterson
27s main
main
27s
AlignAndFocusPowderSlim prototype Check for merge conflicts #17103: Pull request #38279 synchronize by peterfpeterson
29s peterfpeterson:ewm6343_aafpff_slim
peterfpeterson:ewm6343_aafpff_slim
29s
Parial move of reflectometry gui to std::optional Check for merge conflicts #17102: Pull request #38545 synchronize by peterfpeterson
24s peterfpeterson:37875_boost_optional
peterfpeterson:37875_boost_optional
24s
Merge ornl-next into main Check for merge conflicts #17101: Commit 9a94690 pushed by mantid-builder
25s main
main
25s
Merge pull request #38623 from peterfpeterson/polarization_tests_ornl… Check for merge conflicts #17100: Commit a258cfe pushed by peterfpeterson
24s ornl-next
ornl-next
24s
Change windows macro for warnings into compiler flags - ornl-next Check for merge conflicts #17099: Pull request #38624 opened by peterfpeterson
24s peterfpeterson:windows_suppress_warnings
peterfpeterson:windows_suppress_warnings
24s
Merge pull request #38622 from peterfpeterson/integrate_peaks_1dprofile Check for merge conflicts #17098: Commit 77f5a54 pushed by peterfpeterson
34s ornl-next
ornl-next
34s