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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Add SplitterWorkspace input for AlignAndFocusPowderSlim Check for merge conflicts #21125: Pull request #39721 synchronize by rosswhitfield
July 25, 2025 03:41 22s rosswhitfield:aafps_splitterworkspace2
rosswhitfield:aafps_splitterworkspace2
July 25, 2025 03:41 22s
Add SplitterWorkspace input for AlignAndFocusPowderSlim Check for merge conflicts #21124: Pull request #39721 synchronize by rosswhitfield
July 25, 2025 01:47 24s rosswhitfield:aafps_splitterworkspace2
rosswhitfield:aafps_splitterworkspace2
July 25, 2025 01:47 24s
Move classes outside of AlignAndFocusPowderSlim into own folder. Check for merge conflicts #21123: Pull request #39735 synchronize by rosswhitfield
July 25, 2025 00:40 23s rosswhitfield:aafps_subfolder
rosswhitfield:aafps_subfolder
July 25, 2025 00:40 23s
Move classes outside of AlignAndFocusPowderSlim into own folder. Check for merge conflicts #21122: Pull request #39735 opened by rosswhitfield
July 24, 2025 21:43 28s rosswhitfield:aafps_subfolder
rosswhitfield:aafps_subfolder
July 24, 2025 21:43 28s
Move from boa to rattler-build Check for merge conflicts #21121: Pull request #39687 synchronize by peterfpeterson
July 24, 2025 21:10 23s peterfpeterson:rattler_build
peterfpeterson:rattler_build
July 24, 2025 21:10 23s
Goodnight, napi 🌜 Check for merge conflicts #21120: Pull request #39658 synchronize by rboston628
July 24, 2025 20:49 24s ewm11399-napi5-4
ewm11399-napi5-4
July 24, 2025 20:49 24s
Move from boa to rattler-build Check for merge conflicts #21119: Pull request #39687 synchronize by peterfpeterson
July 24, 2025 19:52 31s peterfpeterson:rattler_build
peterfpeterson:rattler_build
July 24, 2025 19:52 31s
Texture Analysis - Add Core Script Logic Check for merge conflicts #21118: Pull request #39581 synchronize by andy-bridger
July 24, 2025 19:36 21s texture-analysis-core-script-logic
texture-analysis-core-script-logic
July 24, 2025 19:36 21s
Merge ornl-next into main Check for merge conflicts #21117: Commit 0be76ef pushed by mantid-builder
July 24, 2025 19:30 23s main
main
July 24, 2025 19:30 23s
Goodnight, napi 🌜 Check for merge conflicts #21116: Pull request #39658 synchronize by rboston628
July 24, 2025 19:29 38s ewm11399-napi5-4
ewm11399-napi5-4
July 24, 2025 19:29 38s
Fix hdf5 version in test -- ornl-next (#39734) Check for merge conflicts #21115: Commit eee4f79 pushed by rboston628
July 24, 2025 19:29 8s ornl-next
ornl-next
July 24, 2025 19:29 8s
Goodnight, napi 🌜 Check for merge conflicts #21114: Pull request #39658 synchronize by rboston628
July 24, 2025 19:09 22s ewm11399-napi5-4
ewm11399-napi5-4
July 24, 2025 19:09 22s
Nexus::File to use a shared pointer to an H5File object Check for merge conflicts #21113: Pull request #39732 synchronize by rboston628
July 24, 2025 18:58 22s patch-nexus-file-ptr
patch-nexus-file-ptr
July 24, 2025 18:58 22s
Nexus::File to use a shared pointer to an H5File object Check for merge conflicts #21112: Pull request #39732 synchronize by rboston628
July 24, 2025 18:53 22s patch-nexus-file-ptr
patch-nexus-file-ptr
July 24, 2025 18:53 22s
Fix hdf5 version in test -- ornl-next Check for merge conflicts #21111: Pull request #39734 opened by rboston628
July 24, 2025 17:05 26s 39731-ornl-next
39731-ornl-next
July 24, 2025 17:05 26s
Move from boa to rattler-build Check for merge conflicts #21110: Pull request #39687 synchronize by peterfpeterson
July 24, 2025 17:03 28s peterfpeterson:rattler_build
peterfpeterson:rattler_build
July 24, 2025 17:03 28s
Fix hdf5 version in test (#39731) Check for merge conflicts #21109: Commit feb8607 pushed by SilkeSchomann
July 24, 2025 16:33 23s main
main
July 24, 2025 16:33 23s
Move classes outside of AlignAndFocusPowderSlim into own folder. (#39… Check for merge conflicts #21108: Commit 0007c02 pushed by rboston628
July 24, 2025 16:23 25s main
main
July 24, 2025 16:23 25s
Texture Analysis - Add Core Script Logic Check for merge conflicts #21107: Pull request #39581 synchronize by andy-bridger
July 24, 2025 16:15 22s texture-analysis-core-script-logic
texture-analysis-core-script-logic
July 24, 2025 16:15 22s
Condense PR template Check for merge conflicts #21106: Pull request #39733 synchronize by MialLewis
July 24, 2025 15:50 22s edit_PR_guidelines
edit_PR_guidelines
July 24, 2025 15:50 22s
Move from boa to rattler-build Check for merge conflicts #21105: Pull request #39687 synchronize by peterfpeterson
July 24, 2025 15:49 23s peterfpeterson:rattler_build
peterfpeterson:rattler_build
July 24, 2025 15:49 23s
Condense PR template Check for merge conflicts #21104: Pull request #39733 synchronize by MialLewis
July 24, 2025 14:50 22s edit_PR_guidelines
edit_PR_guidelines
July 24, 2025 14:50 22s
Condense PR template Check for merge conflicts #21103: Pull request #39733 synchronize by MialLewis
July 24, 2025 14:48 28s edit_PR_guidelines
edit_PR_guidelines
July 24, 2025 14:48 28s
Condense PR template Check for merge conflicts #21102: Pull request #39733 opened by MialLewis
July 24, 2025 14:45 23s edit_PR_guidelines
edit_PR_guidelines
July 24, 2025 14:45 23s
Crosshair optimization Check for merge conflicts #21101: Pull request #39714 synchronize by KyleQianliMa
July 24, 2025 14:37 25s crosshair_blit
crosshair_blit
July 24, 2025 14:37 25s