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

Bump react-router-dom from 6.21.2 to 6.23.1 Merge conflict check #1168: Commit c06a40f pushed by dependabot bot
May 29, 2024 11:59 10s dependabot/npm_and_yarn/react-router-dom-6.23.1
dependabot/npm_and_yarn/react-router-dom-6.23.1
May 29, 2024 11:59 10s
Bump @babel/preset-env from 7.23.8 to 7.24.6 Merge conflict check #1167: Pull request #463 synchronize by dependabot bot
May 29, 2024 11:59 2m 11s
May 29, 2024 11:59 2m 11s
Bump @babel/preset-env from 7.23.8 to 7.24.6 Merge conflict check #1166: Commit f418a3c pushed by dependabot bot
May 29, 2024 11:59 9s dependabot/npm_and_yarn/babel/preset-env-7.24.6
dependabot/npm_and_yarn/babel/preset-env-7.24.6
May 29, 2024 11:59 9s
Bump @reduxjs/toolkit from 1.9.7 to 2.2.5 Merge conflict check #1165: Pull request #443 synchronize by dependabot bot
May 29, 2024 11:59 13s
May 29, 2024 11:59 13s
Bump @reduxjs/toolkit from 1.9.7 to 2.2.5 Merge conflict check #1164: Commit fe21323 pushed by dependabot bot
May 29, 2024 11:59 13s dependabot/npm_and_yarn/reduxjs/toolkit-2.2.5
dependabot/npm_and_yarn/reduxjs/toolkit-2.2.5
May 29, 2024 11:59 13s
Bump @mui/material from 5.15.6 to 5.15.18 Merge conflict check #1163: Pull request #442 synchronize by dependabot bot
May 29, 2024 11:59 12s
May 29, 2024 11:59 12s
Bump @mui/material from 5.15.6 to 5.15.18 Merge conflict check #1162: Commit 9d449c8 pushed by dependabot bot
May 29, 2024 11:59 11s dependabot/npm_and_yarn/mui/material-5.15.18
dependabot/npm_and_yarn/mui/material-5.15.18
May 29, 2024 11:59 11s
Bump @testing-library/jest-dom from 5.17.0 to 6.4.5 Merge conflict check #1160: Pull request #439 synchronize by dependabot bot
May 29, 2024 11:59 2m 13s
May 29, 2024 11:59 2m 13s
Bump redux and redux-thunk Merge conflict check #1161: Pull request #440 synchronize by dependabot bot
May 29, 2024 11:59 2m 10s
May 29, 2024 11:59 2m 10s
Bump @testing-library/jest-dom from 5.17.0 to 6.4.5 Merge conflict check #1158: Commit 7d74160 pushed by dependabot bot
May 29, 2024 11:59 13s dependabot/npm_and_yarn/testing-library/jest-dom-6.4.5
dependabot/npm_and_yarn/testing-library/jest-dom-6.4.5
May 29, 2024 11:59 13s
Bump redux and redux-thunk Merge conflict check #1159: Commit 39a41b1 pushed by dependabot bot
May 29, 2024 11:59 14s dependabot/npm_and_yarn/multi-ced74c5ccf
dependabot/npm_and_yarn/multi-ced74c5ccf
May 29, 2024 11:59 14s
Bump reselect from 4.1.8 to 5.1.0 Merge conflict check #1157: Pull request #436 synchronize by dependabot bot
May 29, 2024 11:58 11s
May 29, 2024 11:58 11s
Bump reselect from 4.1.8 to 5.1.0 Merge conflict check #1156: Commit f4c4c92 pushed by dependabot bot
May 29, 2024 11:58 11s dependabot/npm_and_yarn/reselect-5.1.0
dependabot/npm_and_yarn/reselect-5.1.0
May 29, 2024 11:58 11s
Merge pull request #470 from lkiesow/container Merge conflict check #1155: Commit ddfd555 pushed by ziegenberg
May 29, 2024 11:57 2m 12s main
main
May 29, 2024 11:57 2m 12s
Merge pull request #389 from schuettloeffel-elsa/385-always-add-curre… Merge conflict check #1154: Commit e76eeb7 pushed by ziegenberg
May 29, 2024 10:10 2m 13s main
main
May 29, 2024 10:10 2m 13s
Add check-label workflow Merge conflict check #1153: Pull request #490 synchronize by ziegenberg
May 29, 2024 09:26 10s
May 29, 2024 09:26 10s
add release configuration Merge conflict check #1152: Pull request #491 opened by ziegenberg
May 29, 2024 09:25 12s
May 29, 2024 09:25 12s
Add check-label workflow Merge conflict check #1151: Pull request #490 opened by ziegenberg
May 29, 2024 09:05 15s
May 29, 2024 09:05 15s
Replace react-script with vite Merge conflict check #1150: Pull request #471 synchronize by geichelberger
May 28, 2024 22:06 11s
May 28, 2024 22:06 11s
Merge pull request #481 from ziegenberg/run-deploy-not-in-forks Merge conflict check #1149: Commit ad384ff pushed by lkiesow
May 28, 2024 18:45 2m 13s main
main
May 28, 2024 18:45 2m 13s
Test deployments without mocks Merge conflict check #1148: Pull request #483 opened by geichelberger
May 28, 2024 17:10 13s
May 28, 2024 17:10 13s
Merge pull request #467 from Arnei/flavors-in-event-source-upload-remove Merge conflict check #1147: Commit a49b87d pushed by ziegenberg
May 28, 2024 16:35 2m 13s main
main
May 28, 2024 16:35 2m 13s
Merge pull request #407 from lkiesow/wf-naming Merge conflict check #1146: Commit e89356c pushed by ziegenberg
May 28, 2024 16:32 2m 14s main
main
May 28, 2024 16:32 2m 14s
Better naming for Crowdin workflows Merge conflict check #1145: Pull request #407 synchronize by lkiesow
May 28, 2024 16:31 11s
May 28, 2024 16:31 11s
Do not run the test deployment in any forks Merge conflict check #1144: Pull request #481 opened by ziegenberg
May 28, 2024 16:10 15s
May 28, 2024 16:10 15s