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
7,280 workflow runs
7,280 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Added release notes for MSlice Check for merge conflicts #16963: Pull request #38596 synchronize by SilkeSchomann
January 14, 2025 11:18 26s release_notes_mslice
release_notes_mslice
January 14, 2025 11:18 26s
37795 change polaris pdf norm Check for merge conflicts #16962: Pull request #38535 synchronize by andy-bridger
January 14, 2025 10:37 28s 37795_change_polaris_pdf_norm
37795_change_polaris_pdf_norm
January 14, 2025 10:37 28s
Added release notes for MSlice Check for merge conflicts #16961: Pull request #38596 synchronize by SilkeSchomann
January 14, 2025 09:05 28s release_notes_mslice
release_notes_mslice
January 14, 2025 09:05 28s
Added release notes for MSlice Check for merge conflicts #16960: Pull request #38596 opened by SilkeSchomann
January 14, 2025 09:05 29s release_notes_mslice
release_notes_mslice
January 14, 2025 09:05 29s
Fix for instrument view axes orientation. Check for merge conflicts #16959: Pull request #38593 synchronize by dmitry-ganyushin
January 14, 2025 02:15 29s axes_orientation
axes_orientation
January 14, 2025 02:15 29s
Update pychop definitions for SNS instruments Check for merge conflicts #16958: Pull request #38591 synchronize by mducle
January 14, 2025 01:57 25s pychop_sns_update
pychop_sns_update
January 14, 2025 01:57 25s
Merge ornl-next into main Check for merge conflicts #16957: Commit a9fe5cd pushed by mantid-builder
January 14, 2025 00:20 26s main
main
January 14, 2025 00:20 26s
Merge pull request #38595 from rosswhitfield/sliceviewer_allow_custom… Check for merge conflicts #16956: Commit b66e3b3 pushed by rosswhitfield
January 14, 2025 00:12 26s ornl-next
ornl-next
January 14, 2025 00:12 26s
[pre-commit.ci] pre-commit autoupdate Check for merge conflicts #16955: Pull request #38594 synchronize by pre-commit-ci bot
January 13, 2025 22:39 26s pre-commit-ci-update-config
pre-commit-ci-update-config
January 13, 2025 22:39 26s
Allow users to register custom matplotlib colormaps Check for merge conflicts #16954: Pull request #38595 opened by rosswhitfield
January 13, 2025 22:36 25s rosswhitfield:sliceviewer_allow_custom_colormaps
rosswhitfield:sliceviewer_allow_custom_colormaps
January 13, 2025 22:36 25s
[pre-commit.ci] pre-commit autoupdate Check for merge conflicts #16953: Pull request #38594 opened by pre-commit-ci bot
January 13, 2025 22:36 26s pre-commit-ci-update-config
pre-commit-ci-update-config
January 13, 2025 22:36 26s
Fix for instrument view axes orientation. Check for merge conflicts #16952: Pull request #38593 opened by dmitry-ganyushin
January 13, 2025 20:30 26s axes_orientation
axes_orientation
January 13, 2025 20:30 26s
AlignAndFocusPowderSlim prototype Check for merge conflicts #16951: Pull request #38279 synchronize by peterfpeterson
January 13, 2025 19:43 26s peterfpeterson:ewm6343_aafpff_slim
peterfpeterson:ewm6343_aafpff_slim
January 13, 2025 19:43 26s
added and propagated FullBinsOnly flag Check for merge conflicts #16950: Pull request #38550 synchronize by walshmm
January 13, 2025 18:25 35s expose_fullBinsOnly_in_rebinragged
expose_fullBinsOnly_in_rebinragged
January 13, 2025 18:25 35s
Merge pull request #38580 from mantidproject/restore-lost-legend Check for merge conflicts #16949: Commit 6584721 pushed by peterfpeterson
January 13, 2025 16:58 26s main
main
January 13, 2025 16:58 26s
Merge pull request #38567 from mantidproject/38560_instance_true_for_… Check for merge conflicts #16948: Commit c7f74cc pushed by SilkeSchomann
January 13, 2025 16:54 28s main
main
January 13, 2025 16:54 28s
Merge pull request #38582 from mantidproject/refactor_Save_NXcanSAS Check for merge conflicts #16947: Commit 61bf054 pushed by SilkeSchomann
January 13, 2025 16:32 28s main
main
January 13, 2025 16:32 28s
Prepare for release candidate v6.11.0.3rc1 Check for merge conflicts #16946: Pull request #38592 opened by KedoKudo
January 13, 2025 16:19 27s ornl-next
ornl-next
January 13, 2025 16:19 27s
Add instance=True to mock.create_autospec for speed improvement Check for merge conflicts #16945: Pull request #38567 synchronize by jhaigh0
January 13, 2025 15:25 28s 38560_instance_true_for_create_autospec
38560_instance_true_for_create_autospec
January 13, 2025 15:25 28s
Refactor WildesTest to reduce Code Duplication Check for merge conflicts #16944: Pull request #38529 synchronize by yusufjimoh
January 13, 2025 14:28 27s 38326-refactor-polarizationcorrectionwildestest-to-reduce-code-duplication
38326-refactor-polarizationcorrectionwildestest-to-reduce-code-duplication
January 13, 2025 14:28 27s
Parial move of reflectometry gui to std::optional Check for merge conflicts #16943: Pull request #38545 synchronize by peterfpeterson
January 13, 2025 14:14 28s peterfpeterson:37875_boost_optional
peterfpeterson:37875_boost_optional
January 13, 2025 14:14 28s
Update pychop definitions for SNS instruments Check for merge conflicts #16942: Pull request #38591 opened by mducle
January 13, 2025 14:13 28s pychop_sns_update
pychop_sns_update
January 13, 2025 14:13 28s
Merge ornl-next into main Check for merge conflicts #16941: Commit 6ee0b15 pushed by mantid-builder
January 13, 2025 13:52 28s main
main
January 13, 2025 13:52 28s
Merge pull request #38590 from peterfpeterson/38332_nexus_sorted_incl… Check for merge conflicts #16940: Commit 3bc0c16 pushed by peterfpeterson
January 13, 2025 13:52 30s ornl-next
ornl-next
January 13, 2025 13:52 30s
37795 change polaris pdf norm Check for merge conflicts #16939: Pull request #38535 synchronize by andy-bridger
January 13, 2025 10:16 29s 37795_change_polaris_pdf_norm
37795_change_polaris_pdf_norm
January 13, 2025 10:16 29s