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
5,404 workflow run results
5,404 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #38262 from rosswhitfield/ExtractMaskDonor Check for merge conflicts #15454: Commit 2a139a0 pushed by rosswhitfield
October 21, 2024 23:59 15s ornl-next
ornl-next
October 21, 2024 23:59 15s
[pre-commit.ci] pre-commit autoupdate Check for merge conflicts #15453: Pull request #38158 synchronize by pre-commit-ci bot
October 21, 2024 22:36 29s pre-commit-ci-update-config
pre-commit-ci-update-config
October 21, 2024 22:36 29s
[pre-commit.ci] pre-commit autoupdate Check for merge conflicts #15452: Pull request #38158 synchronize by pre-commit-ci bot
October 21, 2024 22:33 29s pre-commit-ci-update-config
pre-commit-ci-update-config
October 21, 2024 22:33 29s
Add UngroupDetectors to ExtractMask Check for merge conflicts #15451: Pull request #38262 opened by rosswhitfield
October 21, 2024 22:11 27s rosswhitfield:ExtractMaskDonor
rosswhitfield:ExtractMaskDonor
October 21, 2024 22:11 27s
Add end-of-file-fixer to pre-commit Check for merge conflicts #15450: Pull request #38261 synchronize by peterfpeterson
October 21, 2024 19:02 27s peterfpeterson:endoffile
peterfpeterson:endoffile
October 21, 2024 19:02 27s
Update dev docs after setuptools update Check for merge conflicts #15449: Pull request #37976 synchronize by jmborr
October 21, 2024 18:40 29s 37934_update_debugging_dev_docs
37934_update_debugging_dev_docs
October 21, 2024 18:40 29s
Add end-of-file-fixer to pre-commit Check for merge conflicts #15448: Pull request #38261 opened by peterfpeterson
October 21, 2024 18:39 30s peterfpeterson:endoffile
peterfpeterson:endoffile
October 21, 2024 18:39 30s
Merge ornl-next into main Check for merge conflicts #15447: Commit a54002a pushed by mantid-builder
October 21, 2024 18:17 4m 19s main
main
October 21, 2024 18:17 4m 19s
Merge release-next into ornl-next Check for merge conflicts #15446: Commit f57f88b pushed by mantid-builder
October 21, 2024 18:16 9s ornl-next
ornl-next
October 21, 2024 18:16 9s
Merge release-next into main Check for merge conflicts #15445: Commit 161b4c4 pushed by mantid-builder
October 21, 2024 18:16 30s main
main
October 21, 2024 18:16 30s
Merge pull request #38257 from robertapplin/38255-elwin-and-moments-c… Check for merge conflicts #15444: Commit e1813ed pushed by SilkeSchomann
October 21, 2024 18:15 30s release-next
release-next
October 21, 2024 18:15 30s
Merge pull request #38198 from rosswhitfield/ExtractMaskDonor Check for merge conflicts #15443: Commit 7fa6b03 pushed by KedoKudo
October 21, 2024 16:05 30s main
main
October 21, 2024 16:05 30s
Fix normalization for sliceviewer Check for merge conflicts #15442: Pull request #38260 opened by AndreiSavici
October 21, 2024 16:01 27s sliceviewer_normalization_fix
sliceviewer_normalization_fix
October 21, 2024 16:01 27s
Merge ornl-next into main Check for merge conflicts #15441: Commit beabba3 pushed by mantid-builder
October 21, 2024 15:46 28s main
main
October 21, 2024 15:46 28s
Merge release-next into ornl-next Check for merge conflicts #15440: Commit 1f7dda3 pushed by mantid-builder
October 21, 2024 15:46 15s ornl-next
ornl-next
October 21, 2024 15:46 15s
Merge release-next into main Check for merge conflicts #15439: Commit 38bd0a4 pushed by mantid-builder
October 21, 2024 15:46 26s main
main
October 21, 2024 15:46 26s
Merge pull request #38252 from mantidproject/38249 Check for merge conflicts #15438: Commit ba32137 pushed by robertapplin
October 21, 2024 15:45 29s release-next
release-next
October 21, 2024 15:45 29s
Fix crash on Inelastic Data Processor interface Check for merge conflicts #15437: Pull request #38257 opened by robertapplin
October 21, 2024 15:18 27s robertapplin:38255-elwin-and-moments-crash
robertapplin:38255-elwin-and-moments-crash
October 21, 2024 15:18 27s
Stop ReflectometryReductionOneLiveData from re-writing the spectra map on instrument load Check for merge conflicts #15436: Pull request #38256 opened by rbauststfc
October 21, 2024 15:17 27s rbauststfc:38202_fix_live_data_spectra_rewrite
rbauststfc:38202_fix_live_data_spectra_rewrite
October 21, 2024 15:17 27s
Merge pull request #38189 from mantidproject/38101_MVP_refactor_cutvi… Check for merge conflicts #15435: Commit f4dd8e7 pushed by SilkeSchomann
October 21, 2024 14:19 31s main
main
October 21, 2024 14:19 31s
Add mantid help email link to help menu Check for merge conflicts #15434: Pull request #38253 synchronize by jhaigh0
October 21, 2024 13:52 26s mailto_help_button
mailto_help_button
October 21, 2024 13:52 26s
Add mantid help email link to help menu Check for merge conflicts #15433: Pull request #38253 opened by jhaigh0
October 21, 2024 13:51 28s mailto_help_button
mailto_help_button
October 21, 2024 13:51 28s
Enumerated string property Check for merge conflicts #15432: Pull request #38177 synchronize by dmitry-ganyushin
October 21, 2024 13:48 29s enumerated-string-property
enumerated-string-property
October 21, 2024 13:48 29s
fix for sliceviewer Check for merge conflicts #15431: Pull request #38238 synchronize by AndreiSavici
October 21, 2024 13:41 30s sliceviewer_fix
sliceviewer_fix
October 21, 2024 13:41 30s
Fix for DNS Reduction interface not opening Check for merge conflicts #15430: Pull request #38252 opened by SilkeSchomann
October 21, 2024 13:11 32s 38249
38249
October 21, 2024 13:11 32s