Skip to content

Actions: opencast/opencast-editor

Actions

Merge conflict check

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
check-merge-conflict.yml
1,347 workflow runs
1,347 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #1087 from opencast/dependabot/npm_and_yarn/standa… Merge conflict check #3335: Commit ac3ddfe pushed by Arnei
July 13, 2023 12:39 2m 14s main
main
July 13, 2023 12:39 2m 14s
Merge pull request #1091 from opencast/dependabot/npm_and_yarn/mui/ma… Merge conflict check #3334: Commit 3af671d pushed by Arnei
July 13, 2023 12:39 4m 11s main
main
July 13, 2023 12:39 4m 11s
Merge pull request #1088 from opencast/dependabot/npm_and_yarn/react-… Merge conflict check #3333: Commit e840ca0 pushed by Arnei
July 13, 2023 12:37 2m 13s main
main
July 13, 2023 12:37 2m 13s
Bump @types/react from 18.2.6 to 18.2.14 Merge conflict check #3332: Pull request #1092 synchronize by dependabot bot
July 13, 2023 12:24 10s
July 13, 2023 12:24 10s
Bump @types/react from 18.2.6 to 18.2.14 Merge conflict check #3331: Commit d3060c8 pushed by dependabot bot
July 13, 2023 12:24 10s dependabot/npm_and_yarn/types/react-18.2.14
dependabot/npm_and_yarn/types/react-18.2.14
July 13, 2023 12:24 10s
Bump i18next from 22.5.0 to 23.2.11 Merge conflict check #3330: Pull request #1103 opened by dependabot bot
July 13, 2023 12:23 13s
July 13, 2023 12:23 13s
Bump i18next from 22.5.0 to 23.2.11 Merge conflict check #3329: Commit 74058ab pushed by dependabot bot
July 13, 2023 12:23 12s dependabot/npm_and_yarn/i18next-23.2.11
dependabot/npm_and_yarn/i18next-23.2.11
July 13, 2023 12:23 12s
Bump react-beforeunload from 2.5.3 to 2.6.0 Merge conflict check #3328: Pull request #1088 synchronize by dependabot bot
July 13, 2023 12:23 2m 13s
July 13, 2023 12:23 2m 13s
Bump react-beforeunload from 2.5.3 to 2.6.0 Merge conflict check #3327: Commit 7c0f0e8 pushed by dependabot bot
July 13, 2023 12:23 10s dependabot/npm_and_yarn/react-beforeunload-2.6.0
dependabot/npm_and_yarn/react-beforeunload-2.6.0
July 13, 2023 12:23 10s
Bump @types/react from 18.2.6 to 18.2.14 Merge conflict check #3326: Pull request #1092 synchronize by dependabot bot
July 13, 2023 12:23 13s
July 13, 2023 12:23 13s
Bump @types/react from 18.2.6 to 18.2.14 Merge conflict check #3325: Commit b0bb466 pushed by dependabot bot
July 13, 2023 12:23 11s dependabot/npm_and_yarn/types/react-18.2.14
dependabot/npm_and_yarn/types/react-18.2.14
July 13, 2023 12:23 11s
Merge pull request #1089 from opencast/dependabot/npm_and_yarn/playwr… Merge conflict check #3324: Commit 2199943 pushed by Arnei
July 13, 2023 12:22 2m 13s main
main
July 13, 2023 12:22 2m 13s
Merge pull request #1090 from opencast/dependabot/npm_and_yarn/react-… Merge conflict check #3323: Commit e8e8034 pushed by Arnei
July 13, 2023 12:22 2m 12s main
main
July 13, 2023 12:22 2m 12s
Bump @types/react from 18.2.6 to 18.2.14 Merge conflict check #3322: Pull request #1092 synchronize by dependabot bot
July 13, 2023 12:16 13s
July 13, 2023 12:16 13s
Bump @types/react from 18.2.6 to 18.2.14 Merge conflict check #3321: Commit a851dca pushed by dependabot bot
July 13, 2023 12:16 11s dependabot/npm_and_yarn/types/react-18.2.14
dependabot/npm_and_yarn/types/react-18.2.14
July 13, 2023 12:16 11s
Merge pull request #1094 from opencast/dependabot/npm_and_yarn/emotio… Merge conflict check #3320: Commit ceb2738 pushed by Arnei
July 13, 2023 12:15 2m 13s main
main
July 13, 2023 12:15 2m 13s
Merge pull request #1095 from opencast/dependabot/npm_and_yarn/types/… Merge conflict check #3319: Commit 374af7b pushed by Arnei
July 13, 2023 12:15 2m 15s main
main
July 13, 2023 12:15 2m 15s
Redesign Merge conflict check #3318: Pull request #1079 synchronize by Arnei
July 12, 2023 13:34 16s
July 12, 2023 13:34 16s
Implement editor locking so only one person can edit a recording a time Merge conflict check #3317: Pull request #1102 opened by JamesUoM
July 12, 2023 12:28 14s
July 12, 2023 12:28 14s
Redesign Merge conflict check #3316: Pull request #1079 synchronize by Arnei
July 12, 2023 08:31 10s
July 12, 2023 08:31 10s
Redesign Merge conflict check #3315: Pull request #1079 synchronize by Arnei
July 12, 2023 08:26 14s
July 12, 2023 08:26 14s
Redesign Merge conflict check #3314: Pull request #1079 synchronize by Arnei
July 12, 2023 07:32 11s
July 12, 2023 07:32 11s
Merge pull request #1098 from Arnei/readme-unify-configuraiton Merge conflict check #3313: Commit dab605a pushed by Arnei
July 12, 2023 06:56 2m 12s main
main
July 12, 2023 06:56 2m 12s
Combine "Configuration" sections in ReadMe Merge conflict check #3312: Pull request #1098 synchronize by Arnei
July 12, 2023 06:56 11s
July 12, 2023 06:56 11s
Merge pull request #1099 from Arnei/readme-mention-waveform Merge conflict check #3311: Commit f79b446 pushed by Arnei
July 12, 2023 06:54 2m 14s main
main
July 12, 2023 06:54 2m 14s
ProTip! You can narrow down the results and go further in time using created:<2023-07-12 or the other filters available.