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
703 workflow run results
703 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Update Qt connection syntax in Inelastic Interfaces Check for merge conflicts #15042: Pull request #38119 synchronize by adriazalvarez
26s new_qt_connection_syntax_inelastic_interfaces
new_qt_connection_syntax_inelastic_interfaces
26s
pre-commit.ci run clang-format Check for merge conflicts #15041: Pull request #38126 opened by peterfpeterson
32s peterfpeterson:precommit_clangformat
peterfpeterson:precommit_clangformat
32s
Replace relative and absolute differences with new operations Check for merge conflicts #15040: Pull request #38067 synchronize by rboston628
27s ewm7196-replace-comparisons
ewm7196-replace-comparisons
27s
Add flag to CompareWorkspaces so users can specify NaN == NaN behavior - ornl-next Check for merge conflicts #15039: Pull request #38125 opened by rboston628
26s ewm7196-nans-flag-ornl
ewm7196-nans-flag-ornl
26s
enumerated string property Check for merge conflicts #15038: Pull request #38124 synchronize by pre-commit-ci bot
27s ewm2591-enumerated-string
ewm2591-enumerated-string
27s
enumerated string property Check for merge conflicts #15037: Pull request #38124 opened by rboston628
29s ewm2591-enumerated-string
ewm2591-enumerated-string
29s
Merge pull request #38122 from peterfpeterson/releasenext_into_main Check for merge conflicts #15036: Commit c89b6ba pushed by KedoKudo
35s main
main
35s
Merge pull request #38121 from mantidproject/remove-prompt-pulse Check for merge conflicts #15035: Commit 75614ab pushed by dmitry-ganyushin
12s ornl-next
ornl-next
12s
Merge pull request #38120 from peterfpeterson/37860_remove_pylint_orn… Check for merge conflicts #15034: Commit 91b9a55 pushed by peterfpeterson
28s ornl-next
ornl-next
28s
Merge pull request #38075 from mantidproject/ewm7196-nans-flag Check for merge conflicts #15033: Commit db4f29d pushed by KedoKudo
33s main
main
33s
Add gsas2 unit tests Check for merge conflicts #15032: Pull request #38123 opened by GuiMacielPereira
32s add-gsas2-view-tests
add-gsas2-view-tests
32s
Use ruff to check for wild imports Check for merge conflicts #15031: Pull request #38068 synchronize by pre-commit-ci bot
29s 0-wild-imports
0-wild-imports
29s
Use ruff to check for wild imports Check for merge conflicts #15030: Pull request #38068 synchronize by robertapplin
30s 0-wild-imports
0-wild-imports
30s
Use ruff to check for wild imports Check for merge conflicts #15029: Pull request #38068 synchronize by pre-commit-ci bot
27s 0-wild-imports
0-wild-imports
27s
Use ruff to check for wild imports Check for merge conflicts #15028: Pull request #38068 synchronize by robertapplin
32s 0-wild-imports
0-wild-imports
32s
Use ruff to check for wild imports Check for merge conflicts #15027: Pull request #38068 synchronize by robertapplin
33s 0-wild-imports
0-wild-imports
33s
Merge release-next into main Check for merge conflicts #15026: Pull request #38122 opened by peterfpeterson
29s peterfpeterson:releasenext_into_main
peterfpeterson:releasenext_into_main
29s
Use ruff to check for wild imports Check for merge conflicts #15025: Pull request #38068 synchronize by robertapplin
30s 0-wild-imports
0-wild-imports
30s
Fix for Remove prompt pulse bug into ornl-next Check for merge conflicts #15024: Pull request #38121 opened by dmitry-ganyushin
28s remove-prompt-pulse
remove-prompt-pulse
28s
Use ruff to check for wild imports Check for merge conflicts #15023: Pull request #38068 synchronize by robertapplin
33s 0-wild-imports
0-wild-imports
33s
[pre-commit.ci] pre-commit autoupdate Check for merge conflicts #15022: Pull request #38109 synchronize by peterfpeterson
28s pre-commit-ci-update-config
pre-commit-ci-update-config
28s
Coverity fixes Check for merge conflicts #15021: Pull request #38100 synchronize by jclarkeSTFC
28s coverity_fixes
coverity_fixes
28s
Remove unused Pylint configuration - ornl-next Check for merge conflicts #15020: Pull request #38120 opened by peterfpeterson
32s peterfpeterson:37860_remove_pylint_ornlnext
peterfpeterson:37860_remove_pylint_ornlnext
32s
Replace relative and absolute differences with new operations Check for merge conflicts #15019: Pull request #38067 synchronize by rboston628
29s ewm7196-replace-comparisons
ewm7196-replace-comparisons
29s
Update Qt connection syntax in Inelastic Interfaces Check for merge conflicts #15018: Pull request #38119 opened by adriazalvarez
28s new_qt_connection_syntax_inelastic_interfaces
new_qt_connection_syntax_inelastic_interfaces
28s