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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

update the snspowderredux test to not stripvanadiumpeaks, it reflects… Check for merge conflicts #22213: Pull request #40021 synchronize by walshmm
25s ewm12855_snspowderredux_pg3analysis_intermit_failure_ornl
ewm12855_snspowderredux_pg3analysis_intermit_failure_ornl
25s
update the snspowderredux test to not stripvanadiumpeaks, it reflects… Check for merge conflicts #22212: Pull request #40021 synchronize by walshmm
25s ewm12855_snspowderredux_pg3analysis_intermit_failure_ornl
ewm12855_snspowderredux_pg3analysis_intermit_failure_ornl
25s
[pre-commit.ci] pre-commit autoupdate Check for merge conflicts #22211: Pull request #40022 opened by pre-commit-ci bot
23s pre-commit-ci-update-config
pre-commit-ci-update-config
23s
update the snspowderredux test to not stripvanadiumpeaks, it reflects… Check for merge conflicts #22210: Pull request #40021 opened by walshmm
22s ewm12855_snspowderredux_pg3analysis_intermit_failure_ornl
ewm12855_snspowderredux_pg3analysis_intermit_failure_ornl
22s
Refactor SNSLiveEventDataListener and ADARAParser for improved clarit… Check for merge conflicts #22209: Pull request #40020 synchronize by jmborr
23s sns_live_listener
sns_live_listener
23s
Pattern argument to log_to_python( ) Check for merge conflicts #22208: Pull request #40019 synchronize by jmborr
23s sns_live_listener
sns_live_listener
23s
Pattern argument to log_to_python( ) Check for merge conflicts #22207: Pull request #40019 synchronize by jmborr
22s sns_live_listener
sns_live_listener
22s
Refactor SNSLiveEventDataListener and ADARAParser for improved clarit… Check for merge conflicts #22206: Pull request #40020 synchronize by jmborr
27s sns_live_listener
sns_live_listener
27s
Pattern argument to log_to_python( ) Check for merge conflicts #22205: Pull request #40019 synchronize by jmborr
22s sns_live_listener
sns_live_listener
22s
Refactor SNSLiveEventDataListener and ADARAParser for improved clarit… Check for merge conflicts #22204: Pull request #40020 synchronize by jmborr
23s sns_live_listener
sns_live_listener
23s
Refactor SNSLiveEventDataListener and ADARAParser for improved clarit… Check for merge conflicts #22203: Pull request #40020 opened by jmborr
23s sns_live_listener
sns_live_listener
23s
Pattern argument to log_to_python( ) Check for merge conflicts #22202: Pull request #40019 opened by jmborr
24s sns_live_listener
sns_live_listener
24s
Added MIDAS IDF Check for merge conflicts #22201: Pull request #40014 synchronize by AndreiSavici
22s midas_idf
midas_idf
22s
Add release notes skeleton for 6.15.0 (#39984) Check for merge conflicts #22200: Commit d150656 pushed by jclarkeSTFC
22s main
main
22s
Delete FindPoco.cmake Check for merge conflicts #22199: Pull request #40016 opened by jclarkeSTFC
22s delete_poco_cmake_file
delete_poco_cmake_file
22s
Merge release-next into main Check for merge conflicts #22198: Commit ffaff82 pushed by mantid-builder
23s main
main
23s
Fix help window for conda installs on Windows (#40015) Check for merge conflicts #22197: Commit 1743ddd pushed by thomashampson
23s release-next
release-next
23s
Fix help window for conda installs on Windows Check for merge conflicts #22196: Pull request #40015 synchronize by thomashampson
22s 34739-windows-conda-help-fix
34739-windows-conda-help-fix
22s
Fix help window for conda installs on Windows Check for merge conflicts #22195: Pull request #40015 opened by thomashampson
22s 34739-windows-conda-help-fix
34739-windows-conda-help-fix
22s
Added MIDAS IDF Check for merge conflicts #22194: Pull request #40014 opened by AndreiSavici
21s midas_idf
midas_idf
21s
Move from boa to rattler-build Check for merge conflicts #22193: Pull request #39687 synchronize by peterfpeterson
22s peterfpeterson:rattler_build
peterfpeterson:rattler_build
22s
Merge release-next into main Check for merge conflicts #22192: Commit fc33ef8 pushed by mantid-builder
26s main
main
26s
Fix ZOOM NormaliseByCurrent bug - Ensure period logs are added to mon… Check for merge conflicts #22191: Commit 60127b2 pushed by thomashampson
26s release-next
release-next
26s
add release note for sliceviewer masking Check for merge conflicts #22190: Pull request #40013 opened by MialLewis
23s 0_add_release_note
0_add_release_note
23s
Merge ornl-next into main Check for merge conflicts #22189: Commit f8b5e2a pushed by mantid-builder
26s main
main
26s