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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Add .dockerignore Merge conflict check #1193: Pull request #494 opened by lkiesow
May 30, 2024 23:08 12s
May 30, 2024 23:08 12s
Replace react-script with vite Merge conflict check #1192: Pull request #471 synchronize by geichelberger
May 30, 2024 17:39 15s
May 30, 2024 17:39 15s
Merge pull request #349 from lkiesow/ci-true Merge conflict check #1191: Commit e29378e pushed by ziegenberg
May 30, 2024 14:39 2m 12s main
main
May 30, 2024 14:39 2m 12s
remove unused static languages.json Merge conflict check #1190: Pull request #493 opened by ziegenberg
May 30, 2024 14:34 11s
May 30, 2024 14:34 11s
Correctly import zh-CN and zh-TW and remove language flags Merge conflict check #1189: Pull request #457 synchronize by ziegenberg
May 30, 2024 14:32 11s
May 30, 2024 14:32 11s
Merge pull request #460 from ziegenberg/remove-video-editor-scss Merge conflict check #1188: Commit 6fd4155 pushed by ziegenberg
May 30, 2024 13:48 2m 12s main
main
May 30, 2024 13:48 2m 12s
Remove superflous SCSS for old video editor Merge conflict check #1187: Pull request #460 synchronize by ziegenberg
May 30, 2024 13:47 12s
May 30, 2024 13:47 12s
Automatically deploy pull requests Merge conflict check #1186: Pull request #472 synchronize by lkiesow
May 30, 2024 09:32 11s
May 30, 2024 09:32 11s
Bump redux and redux-thunk Merge conflict check #1185: Pull request #440 synchronize by dependabot bot
May 30, 2024 08:42 13s
May 30, 2024 08:42 13s
Bump redux and redux-thunk Merge conflict check #1184: Commit ce7441a pushed by dependabot bot
May 30, 2024 08:42 13s dependabot/npm_and_yarn/multi-ced74c5ccf
dependabot/npm_and_yarn/multi-ced74c5ccf
May 30, 2024 08:42 13s
Bump reselect from 4.1.8 to 5.1.0 Merge conflict check #1183: Pull request #436 synchronize by dependabot bot
May 30, 2024 08:42 11s
May 30, 2024 08:42 11s
Bump reselect from 4.1.8 to 5.1.0 Merge conflict check #1182: Commit e819604 pushed by dependabot bot
May 30, 2024 08:42 11s dependabot/npm_and_yarn/reselect-5.1.0
dependabot/npm_and_yarn/reselect-5.1.0
May 30, 2024 08:42 11s
Merge pull request #434 from opencast/dependabot/npm_and_yarn/yup-1.4.0 Merge conflict check #1181: Commit 14cfb74 pushed by ziegenberg
May 30, 2024 08:41 2m 12s main
main
May 30, 2024 08:41 2m 12s
Use correct source for container image Merge conflict check #1180: Pull request #492 opened by lkiesow
May 30, 2024 08:41 15s
May 30, 2024 08:41 15s
Bump @babel/preset-env from 7.23.8 to 7.24.6 Merge conflict check #1179: Pull request #463 synchronize by dependabot bot
May 30, 2024 08:31 18s
May 30, 2024 08:31 18s
Bump @babel/preset-env from 7.23.8 to 7.24.6 Merge conflict check #1178: Commit b4e7b1b pushed by dependabot bot
May 30, 2024 08:31 13s dependabot/npm_and_yarn/babel/preset-env-7.24.6
dependabot/npm_and_yarn/babel/preset-env-7.24.6
May 30, 2024 08:31 13s
Merge pull request #430 from JulianKniephoff/fix-build-warnings Merge conflict check #1177: Commit b77c0c2 pushed by lkiesow
May 30, 2024 08:30 2m 12s main
main
May 30, 2024 08:30 2m 12s
Fix build warnings Merge conflict check #1176: Pull request #430 synchronize by JulianKniephoff
May 30, 2024 07:46 14s
May 30, 2024 07:46 14s
Remove superflous SCSS for old video editor Merge conflict check #1175: Pull request #460 synchronize by ziegenberg
May 29, 2024 12:41 13s
May 29, 2024 12:41 13s
Remove superflous SCSS for old video editor Merge conflict check #1174: Pull request #460 synchronize by ziegenberg
May 29, 2024 12:09 11s
May 29, 2024 12:09 11s
Remove superflous SCSS for old video editor Merge conflict check #1173: Pull request #460 synchronize by ziegenberg
May 29, 2024 12:00 27s
May 29, 2024 12:00 27s
Bump yup from 1.3.3 to 1.4.0 Merge conflict check #1172: Pull request #434 synchronize by dependabot bot
May 29, 2024 12:00 24s
May 29, 2024 12:00 24s
Bump yup from 1.3.3 to 1.4.0 Merge conflict check #1171: Commit 4ef3036 pushed by dependabot bot
May 29, 2024 12:00 10s dependabot/npm_and_yarn/yup-1.4.0
dependabot/npm_and_yarn/yup-1.4.0
May 29, 2024 12:00 10s
Replace deprecated i18next-xhr-backend with i18next-http-backend Merge conflict check #1170: Pull request #461 synchronize by ziegenberg
May 29, 2024 11:59 14s
May 29, 2024 11:59 14s
Bump react-router-dom from 6.21.2 to 6.23.1 Merge conflict check #1169: Pull request #444 synchronize by dependabot bot
May 29, 2024 11:59 28s
May 29, 2024 11:59 28s