Skip to content

Actions: robertapplin/mantid

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
111 workflow runs
111 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge ornl-next into main Check for merge conflicts #166: Commit 356e3be pushed by robertapplin
September 23, 2024 14:24 16s main
main
September 23, 2024 14:24 16s
Merge ornl-next into main Check for merge conflicts #165: Commit d243784 pushed by robertapplin
September 19, 2024 12:52 13s main
main
September 19, 2024 12:52 13s
Merge pull request #37724 from mantidproject/37634_improve_elwin_run Check for merge conflicts #164: Commit 02f18f1 pushed by robertapplin
August 20, 2024 15:26 15s main
main
August 20, 2024 15:26 15s
Merge pull request #37807 from mantidproject/drtsans_loadevent_nexus_bug Check for merge conflicts #163: Commit a7e3261 pushed by robertapplin
August 15, 2024 10:50 14s main
main
August 15, 2024 10:50 14s
Merge pull request #37751 from mantidproject/load_settings Check for merge conflicts #162: Commit 2ae50d1 pushed by robertapplin
August 14, 2024 13:52 12s main
main
August 14, 2024 13:52 12s
Merge pull request #37778 from robertapplin/37776-review-indirect-com… Check for merge conflicts #161: Commit db15b83 pushed by robertapplin
August 14, 2024 08:25 21s main
main
August 14, 2024 08:25 21s
Merge pull request #37739 from mantidproject/31258_addnote Check for merge conflicts #160: Commit 81180cf pushed by robertapplin
August 9, 2024 08:12 15s main
main
August 9, 2024 08:12 15s
Merge pull request #37725 from robertapplin/0-fix-seg-fault-in-extrac… Check for merge conflicts #159: Commit 69e8aaa pushed by robertapplin
August 1, 2024 08:48 14s main
main
August 1, 2024 08:48 14s
Merge pull request #37653 from robertapplin/0-normalise-by-original-s… Check for merge conflicts #158: Commit 4d2e8dc pushed by robertapplin
July 23, 2024 08:24 13s main
main
July 23, 2024 08:24 13s
Merge pull request #37618 from robertapplin/36349-allow-a0-load-in-fu… Check for merge conflicts #157: Commit a465b5d pushed by robertapplin
July 15, 2024 13:16 16s main
main
July 15, 2024 13:16 16s
Merge pull request #37649 from mantidproject/feature_GenerateGrouping… Check for merge conflicts #156: Commit 77dfdc6 pushed by robertapplin
July 12, 2024 15:26 14s main
main
July 12, 2024 15:26 14s
Merge ornl-next into main Check for merge conflicts #155: Commit 842dc66 pushed by robertapplin
July 7, 2024 17:07 10s main
main
July 7, 2024 17:07 10s
Merge pull request #37574 from robertapplin/37381-use-run-widget-in-c… Check for merge conflicts #154: Commit 3d69faf pushed by robertapplin
June 27, 2024 08:11 16s main
main
June 27, 2024 08:11 16s
Merge branch 'release-next' Check for merge conflicts #153: Commit 56bcc5a pushed by robertapplin
June 25, 2024 09:58 12s main
main
June 25, 2024 09:58 12s
Merge pull request #37524 from mantidproject/37040-dragging-text-onto… Check for merge conflicts #152: Commit 271f9b2 pushed by robertapplin
June 25, 2024 08:17 14s main
main
June 25, 2024 08:17 14s
Merge branch 'ornl-next' Check for merge conflicts #151: Commit aca63c2 pushed by robertapplin
June 17, 2024 13:47 15s main
main
June 17, 2024 13:47 15s
Merge release-next into ornl-next Check for merge conflicts #150: Commit 7ddcbca pushed by robertapplin
June 17, 2024 13:29 15s ornl-next
ornl-next
June 17, 2024 13:29 15s
37041 scrolling on plot when cursor is above legend will grab the leg… Check for merge conflicts #149: Commit 8b40e48 pushed by robertapplin
June 17, 2024 12:43 10s main
main
June 17, 2024 12:43 10s
Merge pull request #37490 from mantidproject/prevent_gcc_fortify_sour… Check for merge conflicts #148: Commit fee2981 pushed by robertapplin
June 11, 2024 15:46 12s main
main
June 11, 2024 15:46 12s
Merge pull request #37471 from robertapplin/37416-add-manual-testing-… Check for merge conflicts #147: Commit 51067b0 pushed by robertapplin
June 6, 2024 07:25 10s main
main
June 6, 2024 07:25 10s
Merge pull request #37438 from mantidproject/37402-shortcuts-k-and-l-… Check for merge conflicts #146: Commit dedb209 pushed by robertapplin
June 3, 2024 08:43 12s main
main
June 3, 2024 08:43 12s
Merge ornl-next into main Check for merge conflicts #145: Commit be7c13b pushed by robertapplin
May 24, 2024 07:16 11s main
main
May 24, 2024 07:16 11s
Merge pull request #37378 from cailafinn/37373_sans_can_manual_tests Check for merge conflicts #144: Commit 4f33f44 pushed by robertapplin
May 20, 2024 08:12 16s main
main
May 20, 2024 08:12 16s
Merge pull request #37383 from mantidproject/37377_reduction_mantest Check for merge conflicts #143: Commit 1ae183d pushed by robertapplin
May 17, 2024 09:43 11s main
main
May 17, 2024 09:43 11s
Merge pull request #37264 from robertapplin/36390-create-fitting-pres… Check for merge conflicts #142: Commit da44283 pushed by robertapplin
May 14, 2024 12:29 15s main
main
May 14, 2024 12:29 15s