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
1,976 workflow run results
1,976 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Some unusedVariiable cppckeck error removals. Check for merge conflicts #15997: Pull request #38397 opened by jhaigh0
27s unread_variable_cppcheck
unread_variable_cppcheck
27s
Merge pull request #38317 from mantidproject/alc-loading-to-mvp Check for merge conflicts #15996: Commit c855ad4 pushed by rbauststfc
31s main
main
31s
Use std::pair instead of QPair in utility files Check for merge conflicts #15995: Pull request #38396 synchronize by robertapplin
29s robertapplin:0-use-std-structures-in-spectroscopy-utility-files
robertapplin:0-use-std-structures-in-spectroscopy-utility-files
29s
Elwin Elastic line integration issue Check for merge conflicts #15994: Pull request #38392 synchronize by pre-commit-ci bot
26s elwin_elastic_integ_fix_ornl
elwin_elastic_integ_fix_ornl
26s
Elwin Elastic line integration issue Check for merge conflicts #15993: Pull request #38392 synchronize by mpatrou
30s elwin_elastic_integ_fix_ornl
elwin_elastic_integ_fix_ornl
30s
Use std::pair instead of QPair in utility files Check for merge conflicts #15992: Pull request #38396 opened by robertapplin
29s robertapplin:0-use-std-structures-in-spectroscopy-utility-files
robertapplin:0-use-std-structures-in-spectroscopy-utility-files
29s
Update SaveISISReflectometryORSO with a Class diagram Check for merge conflicts #15991: Pull request #38389 synchronize by jmborr
25s isis_orso_docs_update
isis_orso_docs_update
25s
Update SaveISISReflectometryORSO with a Class diagram Check for merge conflicts #15990: Pull request #38390 synchronize by jmborr
26s isis_orso_docs_update
isis_orso_docs_update
26s
Remove QObjects from ALCFitting Presenter and Model Check for merge conflicts #15989: Pull request #38211 synchronize by cailafinn
26s cailafinn:38007_fitting_presenter_qobject
cailafinn:38007_fitting_presenter_qobject
26s
ALC Loading interface to MVP Check for merge conflicts #15988: Pull request #38317 synchronize by GuiMacielPereira
32s alc-loading-to-mvp
alc-loading-to-mvp
32s
34850 systemtests with ctest Check for merge conflicts #15987: Pull request #38381 synchronize by cailafinn
27s cailafinn:34850_systemtests_with_ctest
cailafinn:34850_systemtests_with_ctest
27s
Merge ornl-next into main Check for merge conflicts #15986: Commit 5b6a12f pushed by mantid-builder
28s main
main
28s
Merge pull request #38376 from mantidproject/enum-strings-bug Check for merge conflicts #15985: Commit 2d60eda pushed by dmitry-ganyushin
31s ornl-next
ornl-next
31s
Create Monte Carlo Workspace Algorithm Check for merge conflicts #15984: Pull request #38341 synchronize by pre-commit-ci bot
29s Create_Monte_Carlo_Ws
Create_Monte_Carlo_Ws
29s
Create Monte Carlo Workspace Algorithm Check for merge conflicts #15983: Pull request #38341 synchronize by Despiix
29s Create_Monte_Carlo_Ws
Create_Monte_Carlo_Ws
29s
Create Monte Carlo Workspace Algorithm Check for merge conflicts #15982: Pull request #38341 synchronize by Despiix
28s Create_Monte_Carlo_Ws
Create_Monte_Carlo_Ws
28s
Create Monte Carlo Workspace Algorithm Check for merge conflicts #15981: Pull request #38341 synchronize by Despiix
31s Create_Monte_Carlo_Ws
Create_Monte_Carlo_Ws
31s
Remove deprecated Calculate Paalman Pings tab from Inelastic Corrections Check for merge conflicts #15980: Pull request #38391 synchronize by robertapplin
29s robertapplin:36365-remove-paalman-pings-inelastic-corrections-tab
robertapplin:36365-remove-paalman-pings-inelastic-corrections-tab
29s
Remove deprecated Calculate Paalman Pings tab from Inelastic Corrections Check for merge conflicts #15979: Pull request #38391 opened by robertapplin
27s robertapplin:36365-remove-paalman-pings-inelastic-corrections-tab
robertapplin:36365-remove-paalman-pings-inelastic-corrections-tab
27s
34850 systemtests with ctest Check for merge conflicts #15978: Pull request #38381 synchronize by cailafinn
28s cailafinn:34850_systemtests_with_ctest
cailafinn:34850_systemtests_with_ctest
28s
fix coverity issue in findreflectomeryline (#38387) Check for merge conflicts #15977: Commit 00c974d pushed by robertapplin
31s main
main
31s
Update SANS Manual Testing Instructions (#38325) Check for merge conflicts #15976: Commit bca6c73 pushed by robertapplin
32s main
main
32s
34850 systemtests with ctest Check for merge conflicts #15975: Pull request #38381 synchronize by cailafinn
29s cailafinn:34850_systemtests_with_ctest
cailafinn:34850_systemtests_with_ctest
29s
34850 systemtests with ctest Check for merge conflicts #15974: Pull request #38381 reopened by cailafinn
27s cailafinn:34850_systemtests_with_ctest
cailafinn:34850_systemtests_with_ctest
27s
Use Mslice as conda package instead of an external interface (#38299) Check for merge conflicts #15973: Commit ee71d5f pushed by thomashampson
31s main
main
31s