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
8,156 workflow runs
8,156 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Made required changes so that pystog can now be optional Check for merge conflicts #21977: Pull request #39936 synchronize by dlcaballero16
24s make-pystog-optional
make-pystog-optional
24s
Made required changes so that pystog can now be optional Check for merge conflicts #21976: Pull request #39936 synchronize by dlcaballero16
27s make-pystog-optional
make-pystog-optional
27s
Made required changes so that pystog can now be optional Check for merge conflicts #21975: Pull request #39936 synchronize by dlcaballero16
23s make-pystog-optional
make-pystog-optional
23s
Merge ornl-next into main Check for merge conflicts #21974: Commit 288d4ed pushed by mantid-builder
27s main
main
27s
Fix vtk OpenGL error on opening new instrument view (#39945) Check for merge conflicts #21973: Commit b23c80c pushed by peterfpeterson
30s ornl-next
ornl-next
30s
Fix vtk OpenGL error on opening new instrument view Check for merge conflicts #21972: Pull request #39945 opened by peterfpeterson
27s peterfpeterson:vtk_pin
peterfpeterson:vtk_pin
27s
Fix vtk OpenGL error on opening new instrument view (#39899) Check for merge conflicts #21971: Commit 1c72f4e pushed by thomashampson
26s main
main
26s
Replaced boost::spirit grammar with boost::parser Check for merge conflicts #21970: Pull request #39694 synchronize by SilkeSchomann
27s 39617_remove_boost_optional_matrixvectorpairparser
39617_remove_boost_optional_matrixvectorpairparser
27s
Split up test files targets better Check for merge conflicts #21969: Pull request #39154 synchronize by peterfpeterson
25s peterfpeterson:clearer_test_files
peterfpeterson:clearer_test_files
25s
Fix Docs Packaging (mambabuild) Job Failing to Find & Generate Test Data Check for merge conflicts #21968: Pull request #39924 synchronize by cailafinn
27s fix-packaging
fix-packaging
27s
Merge ornl-next into main Check for merge conflicts #21967: Commit d142a9a pushed by mantid-builder
41s main
main
41s
AlignAndFocusPowderSlim selective sample log loading (#39942) Check for merge conflicts #21966: Commit 38b092b pushed by peterfpeterson
25s ornl-next
ornl-next
25s
Fix Docs Packaging (mambabuild) Job Failing to Find & Generate Test Data Check for merge conflicts #21965: Pull request #39924 synchronize by cailafinn
24s fix-packaging
fix-packaging
24s
Select line plot units, sum spectra, export to ADS Check for merge conflicts #21964: Pull request #39938 synchronize by jclarkeSTFC
24s jclarkeSTFC:select_line_plot_units
jclarkeSTFC:select_line_plot_units
24s
Fix crash in PolarizationEfficiencyCor algorithm for wrong input (#39… Check for merge conflicts #21963: Commit e088bb1 pushed by SilkeSchomann
28s main
main
28s
Texture analysis GUI Check for merge conflicts #21962: Pull request #39922 synchronize by andy-bridger
27s texture-analysis-gui
texture-analysis-gui
27s
Algorithm for Polarization corrections in zoom and larmor (#39933) Check for merge conflicts #21961: Commit ebdbcc9 pushed by SilkeSchomann
29s main
main
29s
Made required changes so that pystog can now be optional Check for merge conflicts #21960: Pull request #39936 synchronize by dlcaballero16
24s make-pystog-optional
make-pystog-optional
24s
Release notes for MSlice for Release 6.14 Check for merge conflicts #21959: Pull request #39943 synchronize by SilkeSchomann
28s release_notes_mslice
release_notes_mslice
28s
Release notes for MSlice for Release 6.14 Check for merge conflicts #21958: Pull request #39943 opened by SilkeSchomann
25s release_notes_mslice
release_notes_mslice
25s
AlignAndFocusPowderSlim selective sample log loading Check for merge conflicts #21957: Pull request #39942 opened by peterfpeterson
28s peterfpeterson:aafpslim_log_loading
peterfpeterson:aafpslim_log_loading
28s
Update the Fitting of Peaks in Texture Analysis Pipeline Check for merge conflicts #21956: Pull request #39931 synchronize by andy-bridger
28s texture-fit-tof-fitting
texture-fit-tof-fitting
28s
Select line plot units, sum spectra, export to ADS Check for merge conflicts #21955: Pull request #39938 synchronize by jclarkeSTFC
23s jclarkeSTFC:select_line_plot_units
jclarkeSTFC:select_line_plot_units
23s
2D Pawley refinement for POLDI Check for merge conflicts #21954: Pull request #39912 synchronize by RichardWaiteSTFC
25s 38970_poldi2d_pawley_v4
38970_poldi2d_pawley_v4
25s
2D Pawley refinement for POLDI Check for merge conflicts #21953: Pull request #39912 synchronize by RichardWaiteSTFC
26s 38970_poldi2d_pawley_v4
38970_poldi2d_pawley_v4
26s