Skip to content

Actions: opencast/opencast-admin-interface

Actions

Merge conflict check

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
check-merge-conflict.yml
732 workflow run results
732 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Correctly import zh-CN and zh-TW and remove language flags Merge conflict check #1126: Pull request #457 synchronize by ziegenberg
May 25, 2024 16:12 13s
May 25, 2024 16:12 13s
Bump @reduxjs/toolkit from 1.9.7 to 2.2.5 Merge conflict check #1125: Pull request #443 synchronize by dependabot bot
May 24, 2024 21:22 11s
May 24, 2024 21:22 11s
Bump @reduxjs/toolkit from 1.9.7 to 2.2.5 Merge conflict check #1124: Commit 64b1f31 pushed by dependabot bot
May 24, 2024 21:22 11s dependabot/npm_and_yarn/reduxjs/toolkit-2.2.5
dependabot/npm_and_yarn/reduxjs/toolkit-2.2.5
May 24, 2024 21:22 11s
Bump @babel/preset-env from 7.23.8 to 7.24.6 Merge conflict check #1123: Pull request #463 opened by dependabot bot
May 24, 2024 21:22 11s
May 24, 2024 21:22 11s
Bump @babel/preset-env from 7.23.8 to 7.24.6 Merge conflict check #1122: Commit dab7964 pushed by dependabot bot
May 24, 2024 21:22 11s dependabot/npm_and_yarn/babel/preset-env-7.24.6
dependabot/npm_and_yarn/babel/preset-env-7.24.6
May 24, 2024 21:22 11s
Bump @testing-library/jest-dom from 5.17.0 to 6.4.5 Merge conflict check #1121: Pull request #439 synchronize by dependabot bot
May 24, 2024 21:21 10s
May 24, 2024 21:21 10s
Bump @testing-library/jest-dom from 5.17.0 to 6.4.5 Merge conflict check #1119: Commit 5b7ba3e pushed by dependabot bot
May 24, 2024 21:21 15s dependabot/npm_and_yarn/testing-library/jest-dom-6.4.5
dependabot/npm_and_yarn/testing-library/jest-dom-6.4.5
May 24, 2024 21:21 15s
Bump redux and redux-thunk Merge conflict check #1120: Pull request #440 synchronize by dependabot bot
May 24, 2024 21:21 13s
May 24, 2024 21:21 13s
Bump redux and redux-thunk Merge conflict check #1118: Commit c73ed42 pushed by dependabot bot
May 24, 2024 21:21 10s dependabot/npm_and_yarn/multi-ced74c5ccf
dependabot/npm_and_yarn/multi-ced74c5ccf
May 24, 2024 21:21 10s
Bump react-router-dom from 6.21.2 to 6.23.1 Merge conflict check #1117: Pull request #444 synchronize by dependabot bot
May 24, 2024 21:21 11s
May 24, 2024 21:21 11s
Bump react-router-dom from 6.21.2 to 6.23.1 Merge conflict check #1116: Commit ffede9c pushed by dependabot bot
May 24, 2024 21:21 10s dependabot/npm_and_yarn/react-router-dom-6.23.1
dependabot/npm_and_yarn/react-router-dom-6.23.1
May 24, 2024 21:21 10s
Bump @mui/material from 5.15.6 to 5.15.18 Merge conflict check #1115: Pull request #442 synchronize by dependabot bot
May 24, 2024 21:21 14s
May 24, 2024 21:21 14s
Bump @mui/material from 5.15.6 to 5.15.18 Merge conflict check #1114: Commit 018f4a2 pushed by dependabot bot
May 24, 2024 21:21 11s dependabot/npm_and_yarn/mui/material-5.15.18
dependabot/npm_and_yarn/mui/material-5.15.18
May 24, 2024 21:21 11s
Merge branch 'dependabot/npm_and_yarn/mui/styles-5.15.18' of opencast… Merge conflict check #1113: Commit 030b278 pushed by gregorydlogan
May 24, 2024 21:20 2m 12s main
main
May 24, 2024 21:20 2m 12s
remove partial? vendored frankstein-dependency Fontawesome and replace with react-icons Merge conflict check #1112: Pull request #462 synchronize by ziegenberg
May 24, 2024 21:15 10s
May 24, 2024 21:15 10s
remove partial? vendored frankstein-dependency Fontawesome and replace with react-icons Merge conflict check #1111: Pull request #462 opened by ziegenberg
May 24, 2024 21:11 16s
May 24, 2024 21:11 16s
Replace deprecated i18next-xhr-backend with i18next-http-backend Merge conflict check #1110: Pull request #461 opened by ziegenberg
May 24, 2024 20:56 13s
May 24, 2024 20:56 13s
Merge branch 'to-redux-toolkit-tableFilters' of Arnei/opencast-admin-… Merge conflict check #1109: Commit 122ea8c pushed by gregorydlogan
May 24, 2024 20:48 2m 13s main
main
May 24, 2024 20:48 2m 13s
Remove superflous SCSS for old video editor Merge conflict check #1108: Pull request #460 opened by ziegenberg
May 24, 2024 20:46 10s
May 24, 2024 20:46 10s
Fix unique key issue in WizzardStepper Merge conflict check #1107: Pull request #386 synchronize by ziegenberg
May 24, 2024 15:45 12s
May 24, 2024 15:45 12s
Merge pull request #459 from ziegenberg/fix-deploy-gha Merge conflict check #1106: Commit 244ca0f pushed by KatrinIhler
May 24, 2024 15:10 2m 16s main
main
May 24, 2024 15:10 2m 16s
Fix mock data file path after project restructuring Merge conflict check #1105: Pull request #459 synchronize by ziegenberg
May 24, 2024 14:10 13s
May 24, 2024 14:10 13s
Fix mock data file path after project restructuring Merge conflict check #1104: Pull request #459 opened by ziegenberg
May 24, 2024 14:09 11s
May 24, 2024 14:09 11s
Merge pull request #416 from lkiesow/demo-page Merge conflict check #1103: Commit 2316c06 pushed by ziegenberg
May 24, 2024 13:51 2m 16s main
main
May 24, 2024 13:51 2m 16s
Correctly import zh-CN and zh-TW and remove language flags Merge conflict check #1102: Pull request #457 synchronize by ziegenberg
May 24, 2024 13:35 11s
May 24, 2024 13:35 11s