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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Surface Plotting from Multiple Single-Spectrum Workspaces Check for merge conflicts #17137: Pull request #38599 synchronize by Despiix
January 22, 2025 11:10 28s 3D-plot-with-one-spectra
3D-plot-with-one-spectra
January 22, 2025 11:10 28s
Abins: explicit cache directory management Check for merge conflicts #17136: Pull request #38620 synchronize by ajjackson
January 22, 2025 10:05 30s ajjackson:abins-cache-dir
ajjackson:abins-cache-dir
January 22, 2025 10:05 30s
Merge pull request #38625 from mantidproject/pre-commit-ci-update-config Check for merge conflicts #17135: Commit 893609a pushed by SilkeSchomann
January 22, 2025 07:45 26s main
main
January 22, 2025 07:45 26s
Merge ornl-next into main Check for merge conflicts #17134: Commit 001a2a5 pushed by mantid-builder
January 22, 2025 01:17 27s main
main
January 22, 2025 01:17 27s
Merge pull request #38659 from rosswhitfield/remove_hdf5.h Check for merge conflicts #17133: Commit a618f10 pushed by rosswhitfield
January 22, 2025 01:17 27s ornl-next
ornl-next
January 22, 2025 01:17 27s
Modify code that uses hdf5.h directly (other than napi5.h) to use H5Cpp and H5Util Check for merge conflicts #17132: Pull request #38659 opened by rosswhitfield
January 21, 2025 23:11 25s rosswhitfield:remove_hdf5.h
rosswhitfield:remove_hdf5.h
January 21, 2025 23:11 25s
Merge pull request #38626 from rosswhitfield/remove_hdf5.h Check for merge conflicts #17131: Commit fb29b11 pushed by peterfpeterson
January 21, 2025 23:03 27s main
main
January 21, 2025 23:03 27s
Modify code that uses hdf5.h directly (other than napi5.h) to use H5Cpp and H5Util Check for merge conflicts #17130: Pull request #38626 synchronize by rosswhitfield
January 21, 2025 21:19 27s rosswhitfield:remove_hdf5.h
rosswhitfield:remove_hdf5.h
January 21, 2025 21:19 27s
Merge ornl-next into main Check for merge conflicts #17129: Commit caf334b pushed by mantid-builder
January 21, 2025 18:00 26s main
main
January 21, 2025 18:00 26s
Merge pull request #38651 from peterfpeterson/37875_boost_optional Check for merge conflicts #17128: Commit 31d7c32 pushed by peterfpeterson
January 21, 2025 18:00 28s ornl-next
ornl-next
January 21, 2025 18:00 28s
Parial move of reflectometry gui to std::optional - ornl-next Check for merge conflicts #17127: Pull request #38651 opened by peterfpeterson
January 21, 2025 15:53 27s peterfpeterson:37875_boost_optional
peterfpeterson:37875_boost_optional
January 21, 2025 15:53 27s
Modify code that uses hdf5.h directly (other than napi5.h) to use H5Cpp and H5Util Check for merge conflicts #17126: Pull request #38626 synchronize by rosswhitfield
January 21, 2025 05:22 25s rosswhitfield:remove_hdf5.h
rosswhitfield:remove_hdf5.h
January 21, 2025 05:22 25s
Modify code that uses hdf5.h directly (other than napi5.h) to use H5Cpp and H5Util Check for merge conflicts #17125: Pull request #38626 synchronize by rosswhitfield
January 21, 2025 03:08 27s rosswhitfield:remove_hdf5.h
rosswhitfield:remove_hdf5.h
January 21, 2025 03:08 27s
Modify code that uses hdf5.h directly (other than napi5.h) to use H5Cpp and H5Util Check for merge conflicts #17124: Pull request #38626 synchronize by rosswhitfield
January 21, 2025 02:19 27s rosswhitfield:remove_hdf5.h
rosswhitfield:remove_hdf5.h
January 21, 2025 02:19 27s
Modify code that uses hdf5.h directly (other than napi5.h) to use H5Cpp and H5Util Check for merge conflicts #17123: Pull request #38626 opened by rosswhitfield
January 21, 2025 01:58 27s rosswhitfield:remove_hdf5.h
rosswhitfield:remove_hdf5.h
January 21, 2025 01:58 27s
[pre-commit.ci] pre-commit autoupdate Check for merge conflicts #17122: Pull request #38625 opened by pre-commit-ci bot
January 20, 2025 22:32 25s pre-commit-ci-update-config
pre-commit-ci-update-config
January 20, 2025 22:32 25s
Create Monte Carlo Workspace Algorithm Check for merge conflicts #17121: Pull request #38341 synchronize by Despiix
January 20, 2025 17:59 25s Create_Monte_Carlo_Ws
Create_Monte_Carlo_Ws
January 20, 2025 17:59 25s
Capture c++ stack traces from core dump files on linux Check for merge conflicts #17120: Pull request #38600 synchronize by jhaigh0
January 20, 2025 16:13 27s 38405_capture_cpp_stacktraces_from_core_dumps
38405_capture_cpp_stacktraces_from_core_dumps
January 20, 2025 16:13 27s
Merge release-next into main Check for merge conflicts #17119: Commit 0d952f8 pushed by mantid-builder
January 20, 2025 15:33 30s main
main
January 20, 2025 15:33 30s
Merge pull request #38605 from mantidproject/fix_save_ins Check for merge conflicts #17118: Commit b78002e pushed by SilkeSchomann
January 20, 2025 15:32 26s release-next
release-next
January 20, 2025 15:32 26s
Abins: explicit cache directory management Check for merge conflicts #17117: Pull request #38620 synchronize by ajjackson
January 20, 2025 14:35 26s ajjackson:abins-cache-dir
ajjackson:abins-cache-dir
January 20, 2025 14:35 26s
Capture c++ stack traces from core dump files on linux Check for merge conflicts #17116: Pull request #38600 synchronize by jhaigh0
January 20, 2025 13:40 27s 38405_capture_cpp_stacktraces_from_core_dumps
38405_capture_cpp_stacktraces_from_core_dumps
January 20, 2025 13:40 27s
Remove symmetry elements for SaveINS Check for merge conflicts #17115: Pull request #38605 synchronize by zjmorgan
January 20, 2025 13:20 26s fix_save_ins
fix_save_ins
January 20, 2025 13:20 26s
Abins: explicit cache directory management Check for merge conflicts #17114: Pull request #38620 synchronize by ajjackson
January 20, 2025 13:07 29s ajjackson:abins-cache-dir
ajjackson:abins-cache-dir
January 20, 2025 13:07 29s
Surface Plotting from Multiple Single-Spectrum Workspaces Check for merge conflicts #17113: Pull request #38599 synchronize by Despiix
January 20, 2025 12:44 29s 3D-plot-with-one-spectra
3D-plot-with-one-spectra
January 20, 2025 12:44 29s