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

Filter by event

Loading
Status

Filter by status

Loading
Branch
Actor

Filter by actor

Loading
Bump @mui/material from 5.15.6 to 5.15.19 Merge conflict check #1270: Commit f07b3d2 pushed by dependabot bot
June 1, 2024 12:04 12s dependabot/npm_and_yarn/mui/material-5.15.19
dependabot/npm_and_yarn/mui/material-5.15.19
June 1, 2024 12:04 12s
Merge pull request #506 from opencast/dependabot/npm_and_yarn/react-d… Merge conflict check #1269: Commit b6a5342 pushed by lkiesow
June 1, 2024 12:03 2m 14s main
main
June 1, 2024 12:03 2m 14s
Bump vite from 5.2.11 to 5.2.12 Merge conflict check #1268: Pull request #505 synchronize by dependabot bot
June 1, 2024 12:02 11s
June 1, 2024 12:02 11s
Bump @types/lodash from 4.14.202 to 4.17.4 Merge conflict check #1267: Pull request #502 synchronize by dependabot bot
June 1, 2024 12:02 10s
June 1, 2024 12:02 10s
Bump vite from 5.2.11 to 5.2.12 Merge conflict check #1266: Commit 6858a29 pushed by dependabot bot
June 1, 2024 12:02 14s dependabot/npm_and_yarn/vite-5.2.12
dependabot/npm_and_yarn/vite-5.2.12
June 1, 2024 12:02 14s
Bump @types/lodash from 4.14.202 to 4.17.4 Merge conflict check #1265: Commit 7cb013a pushed by dependabot bot
June 1, 2024 12:02 16s dependabot/npm_and_yarn/types/lodash-4.17.4
dependabot/npm_and_yarn/types/lodash-4.17.4
June 1, 2024 12:02 16s
Bump date-fns from 2.30.0 to 3.6.0 Merge conflict check #1264: Pull request #504 synchronize by dependabot bot
June 1, 2024 12:02 12s
June 1, 2024 12:02 12s
Bump date-fns from 2.30.0 to 3.6.0 Merge conflict check #1263: Commit 75c2620 pushed by dependabot bot
June 1, 2024 12:02 10s dependabot/npm_and_yarn/date-fns-3.6.0
dependabot/npm_and_yarn/date-fns-3.6.0
June 1, 2024 12:02 10s
Bump vite from 5.2.11 to 5.2.12 Merge conflict check #1262: Pull request #505 synchronize by dependabot bot
June 1, 2024 12:01 10s
June 1, 2024 12:01 10s
Bump vite from 5.2.11 to 5.2.12 Merge conflict check #1261: Commit 7fad9af pushed by dependabot bot
June 1, 2024 12:01 14s dependabot/npm_and_yarn/vite-5.2.12
dependabot/npm_and_yarn/vite-5.2.12
June 1, 2024 12:01 14s
Bump date-fns from 2.30.0 to 3.6.0 Merge conflict check #1260: Pull request #504 synchronize by dependabot bot
June 1, 2024 12:01 12s
June 1, 2024 12:01 12s
Bump date-fns from 2.30.0 to 3.6.0 Merge conflict check #1259: Commit 7ef6c03 pushed by dependabot bot
June 1, 2024 12:01 13s dependabot/npm_and_yarn/date-fns-3.6.0
dependabot/npm_and_yarn/date-fns-3.6.0
June 1, 2024 12:01 13s
Merge pull request #507 from opencast/dependabot/npm_and_yarn/types/n… Merge conflict check #1258: Commit 680644b pushed by lkiesow
June 1, 2024 12:01 2m 19s main
main
June 1, 2024 12:01 2m 19s
Merge pull request #500 from opencast/dependabot/npm_and_yarn/axios-1… Merge conflict check #1257: Commit e79c28f pushed by lkiesow
June 1, 2024 12:01 2m 13s main
main
June 1, 2024 12:01 2m 13s
Bump dompurify from 3.1.4 to 3.1.5 Merge conflict check #1256: Pull request #509 opened by dependabot bot
June 1, 2024 11:28 25s
June 1, 2024 11:28 25s
Bump dompurify from 3.1.4 to 3.1.5 Merge conflict check #1255: Commit 9c2b088 pushed by dependabot bot
June 1, 2024 11:28 13s dependabot/npm_and_yarn/dompurify-3.1.5
dependabot/npm_and_yarn/dompurify-3.1.5
June 1, 2024 11:28 13s
Bump i18next-browser-languagedetector from 7.2.0 to 8.0.0 Merge conflict check #1254: Pull request #508 opened by dependabot bot
June 1, 2024 11:28 11s
June 1, 2024 11:28 11s
Bump i18next-browser-languagedetector from 7.2.0 to 8.0.0 Merge conflict check #1253: Commit 28549f5 pushed by dependabot bot
June 1, 2024 11:28 10s dependabot/npm_and_yarn/i18next-browser-languagedetector-8.0.0
dependabot/npm_and_yarn/i18next-browser-languagedetector-8.0.0
June 1, 2024 11:28 10s
Bump @types/node from 20.12.12 to 20.13.0 Merge conflict check #1252: Pull request #507 opened by dependabot bot
June 1, 2024 11:28 14s
June 1, 2024 11:28 14s
Bump @types/node from 20.12.12 to 20.13.0 Merge conflict check #1251: Commit 2f99f87 pushed by dependabot bot
June 1, 2024 11:28 14s dependabot/npm_and_yarn/types/node-20.13.0
dependabot/npm_and_yarn/types/node-20.13.0
June 1, 2024 11:28 14s
Bump react-datepicker from 4.25.0 to 6.9.0 Merge conflict check #1250: Pull request #506 opened by dependabot bot
June 1, 2024 11:28 2m 10s
June 1, 2024 11:28 2m 10s
Bump react-datepicker from 4.25.0 to 6.9.0 Merge conflict check #1249: Commit 8cca970 pushed by dependabot bot
June 1, 2024 11:28 9s dependabot/npm_and_yarn/react-datepicker-6.9.0
dependabot/npm_and_yarn/react-datepicker-6.9.0
June 1, 2024 11:28 9s
Bump vite from 5.2.11 to 5.2.12 Merge conflict check #1248: Pull request #505 opened by dependabot bot
June 1, 2024 11:28 15s
June 1, 2024 11:28 15s
Bump vite from 5.2.11 to 5.2.12 Merge conflict check #1247: Commit bb6c7b0 pushed by dependabot bot
June 1, 2024 11:28 8s dependabot/npm_and_yarn/vite-5.2.12
dependabot/npm_and_yarn/vite-5.2.12
June 1, 2024 11:28 8s
Bump date-fns from 2.30.0 to 3.6.0 Merge conflict check #1246: Pull request #504 opened by dependabot bot
June 1, 2024 11:27 10s
June 1, 2024 11:27 10s