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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #38563 from peterfpeterson/pin_scipy_Jan25_ornlnext Check for merge conflicts #16775: Commit f3a2228 pushed by peterfpeterson
11s ornl-next
ornl-next
11s
New QtWebEngine Implementation of HelpWindow Check for merge conflicts #16774: Pull request #38498 synchronize by SilkeSchomann
26s main
main
26s
Merge pull request #38557 from mantidproject/pin_scipy_Jan25 Check for merge conflicts #16773: Commit 431fc8f pushed by SilkeSchomann
31s main
main
31s
Clarify that gtest is pinned to v1.15.2 Check for merge conflicts #16772: Pull request #38565 opened by peterfpeterson
25s peterfpeterson:gtest_pin
peterfpeterson:gtest_pin
25s
Python Help Window Prototype to remove qtassistant Check for merge conflicts #16771: 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 #16770: 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
Revert scipy pin, update Abins test Check for merge conflicts #16769: Pull request #38561 synchronize by ajjackson
29s ajjackson:abins-scipy-constants
ajjackson:abins-scipy-constants
29s
Fix bug in LoadNGEM where Min/MaxEventsPerFrame were not respected Check for merge conflicts #16768: Pull request #38564 opened by RichardWaiteSTFC
26s 38558_LoadNGEM_not_respecting_min_max_events
38558_LoadNGEM_not_respecting_min_max_events
26s
Pin scipy to less than v1.15.0 - ornl-next Check for merge conflicts #16767: Pull request #38563 opened by peterfpeterson
26s peterfpeterson:pin_scipy_Jan25_ornlnext
peterfpeterson:pin_scipy_Jan25_ornlnext
26s
Add support for histogram ragged workspaces with density=true Check for merge conflicts #16766: Pull request #38551 synchronize by peterfpeterson
26s peterfpeterson:ewm8789_convert_units_ragged
peterfpeterson:ewm8789_convert_units_ragged
26s
Python Help Window Prototype to remove qtassistant Check for merge conflicts #16765: 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
New QtWebEngine Implementation of HelpWindow Check for merge conflicts #16764: Pull request #38498 synchronize by peterfpeterson
30s main
main
30s
Merge pull request #38559 from peterfpeterson/37538_mantidworkbench_e… Check for merge conflicts #16763: Commit ecc9de7 pushed by peterfpeterson
31s main
main
31s
Python Help Window Prototype to remove qtassistant Check for merge conflicts #16762: Pull request #38499 synchronize by darshdinger
42s 37248-remove-qtassistant-and-reduce-size-of-mantiddocs-package
37248-remove-qtassistant-and-reduce-size-of-mantiddocs-package
42s
Revert scipy pin, update Abins test Check for merge conflicts #16761: Pull request #38561 opened by ajjackson
27s ajjackson:abins-scipy-constants
ajjackson:abins-scipy-constants
27s
Pin scipy to less than v1.15.0 Check for merge conflicts #16760: Pull request #38557 synchronize by ajjackson
25s pin_scipy_Jan25
pin_scipy_Jan25
25s
Pin scipy to less than v1.15.0 Check for merge conflicts #16759: Pull request #38557 synchronize by ajjackson
27s pin_scipy_Jan25
pin_scipy_Jan25
27s
New QtWebEngine Implementation of HelpWindow Check for merge conflicts #16758: Pull request #38498 synchronize by mantid-builder
25s main
main
25s
Merge ornl-next into main Check for merge conflicts #16757: Commit 54d52e4 pushed by mantid-builder
31s main
main
31s
Merge pull request #38555 from mantidproject/ewm7830_plotMarkerWS_ORN… Check for merge conflicts #16756: Commit d450db7 pushed by peterfpeterson
12s ornl-next
ornl-next
12s
Parial move of reflectometry gui to std::optional Check for merge conflicts #16755: Pull request #38545 synchronize by peterfpeterson
29s peterfpeterson:37875_boost_optional
peterfpeterson:37875_boost_optional
29s
Parial move of reflectometry gui to std::optional Check for merge conflicts #16754: Pull request #38545 synchronize by peterfpeterson
26s peterfpeterson:37875_boost_optional
peterfpeterson:37875_boost_optional
26s
Plot Marker Workspaces Check for merge conflicts #16753: Pull request #38555 synchronize by searscr
31s ewm7830_plotMarkerWS_ORNL_Next
ewm7830_plotMarkerWS_ORNL_Next
31s
Add mantidworkbench as an entry point for the mantidworkbench Conda package - ornl-next Check for merge conflicts #16752: Pull request #38559 opened by peterfpeterson
25s peterfpeterson:37538_mantidworkbench_entry_point_ornlnext
peterfpeterson:37538_mantidworkbench_entry_point_ornlnext
25s
Pin scipy to less than v1.15.0 Check for merge conflicts #16751: Pull request #38557 opened by sf1919
26s pin_scipy_Jan25
pin_scipy_Jan25
26s