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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #1202 from opencast/dependabot/npm_and_yarn/types/… Merge conflict check #3729: Commit 3f4e996 pushed by Arnei
November 1, 2023 10:02 1m 25s main
main
November 1, 2023 10:02 1m 25s
Merge pull request #1199 from opencast/dependabot/npm_and_yarn/standa… Merge conflict check #3728: Commit ca1dd19 pushed by Arnei
November 1, 2023 10:01 2m 36s main
main
November 1, 2023 10:01 2m 36s
Bump mui-rff from 6.2.3 to 7.1.0 Merge conflict check #3727: Pull request #1204 synchronize by dependabot bot
November 1, 2023 10:00 52s
November 1, 2023 10:00 52s
Bump mui-rff from 6.2.3 to 7.1.0 Merge conflict check #3726: Commit c1ae218 pushed by dependabot bot
November 1, 2023 10:00 54s dependabot/npm_and_yarn/mui-rff-7.1.0
dependabot/npm_and_yarn/mui-rff-7.1.0
November 1, 2023 10:00 54s
Bump @types/react-resizable from 3.0.5 to 3.0.6 Merge conflict check #3725: Pull request #1197 synchronize by dependabot bot
November 1, 2023 10:00 2m 49s
November 1, 2023 10:00 2m 49s
Bump @types/react-beforeunload from 2.1.2 to 2.1.3 Merge conflict check #3724: Pull request #1196 synchronize by dependabot bot
November 1, 2023 10:00 33s
November 1, 2023 10:00 33s
Bump @types/react-resizable from 3.0.5 to 3.0.6 Merge conflict check #3723: Commit 60c9ed6 pushed by dependabot bot
November 1, 2023 10:00 35s dependabot/npm_and_yarn/types/react-resizable-3.0.6
dependabot/npm_and_yarn/types/react-resizable-3.0.6
November 1, 2023 10:00 35s
Bump @types/react-final-form-listeners from 1.0.1 to 1.0.2 Merge conflict check #3721: Pull request #1195 synchronize by dependabot bot
November 1, 2023 10:00 10s
November 1, 2023 10:00 10s
Bump @types/react-beforeunload from 2.1.2 to 2.1.3 Merge conflict check #3722: Commit ec3f10d pushed by dependabot bot
November 1, 2023 10:00 21s dependabot/npm_and_yarn/types/react-beforeunload-2.1.3
dependabot/npm_and_yarn/types/react-beforeunload-2.1.3
November 1, 2023 10:00 21s
Bump @types/react-final-form-listeners from 1.0.1 to 1.0.2 Merge conflict check #3720: Commit 275e167 pushed by dependabot bot
November 1, 2023 10:00 15s dependabot/npm_and_yarn/types/react-final-form-listeners-1.0.2
dependabot/npm_and_yarn/types/react-final-form-listeners-1.0.2
November 1, 2023 10:00 15s
Bump @types/react-resizable from 3.0.5 to 3.0.6 Merge conflict check #3719: Pull request #1197 synchronize by dependabot bot
November 1, 2023 10:00 14s
November 1, 2023 10:00 14s
Bump @types/react-resizable from 3.0.5 to 3.0.6 Merge conflict check #3718: Commit 3bfdbd7 pushed by dependabot bot
November 1, 2023 10:00 11s dependabot/npm_and_yarn/types/react-resizable-3.0.6
dependabot/npm_and_yarn/types/react-resizable-3.0.6
November 1, 2023 10:00 11s
Merge pull request #1193 from opencast/dependabot/npm_and_yarn/types/… Merge conflict check #3717: Commit 5768313 pushed by Arnei
November 1, 2023 09:59 6m 14s main
main
November 1, 2023 09:59 6m 14s
Merge pull request #1194 from opencast/dependabot/npm_and_yarn/types/… Merge conflict check #3716: Commit 681862e pushed by Arnei
November 1, 2023 09:59 2m 15s main
main
November 1, 2023 09:59 2m 15s
Bump @testing-library/jest-dom from 6.1.3 to 6.1.4 Merge conflict check #3715: Pull request #1198 synchronize by dependabot bot
November 1, 2023 09:58 14s
November 1, 2023 09:58 14s
Bump @testing-library/jest-dom from 6.1.3 to 6.1.4 Merge conflict check #3714: Commit 3964555 pushed by dependabot bot
November 1, 2023 09:58 11s dependabot/npm_and_yarn/testing-library/jest-dom-6.1.4
dependabot/npm_and_yarn/testing-library/jest-dom-6.1.4
November 1, 2023 09:58 11s
Bump @opencast/appkit from 0.2.1 to 0.2.2 Merge conflict check #3713: Pull request #1203 synchronize by dependabot bot
November 1, 2023 09:58 10s
November 1, 2023 09:58 10s
Bump @opencast/appkit from 0.2.1 to 0.2.2 Merge conflict check #3712: Commit be90e87 pushed by dependabot bot
November 1, 2023 09:58 11s dependabot/npm_and_yarn/opencast/appkit-0.2.2
dependabot/npm_and_yarn/opencast/appkit-0.2.2
November 1, 2023 09:58 11s
Merge pull request #1192 from opencast/dependabot/npm_and_yarn/mui/ma… Merge conflict check #3711: Commit c748aa9 pushed by Arnei
November 1, 2023 09:57 2m 12s main
main
November 1, 2023 09:57 2m 12s
Merge pull request #1191 from opencast/dependabot/npm_and_yarn/react-… Merge conflict check #3710: Commit f4869c5 pushed by Arnei
November 1, 2023 09:56 2m 13s main
main
November 1, 2023 09:56 2m 13s
Bump @types/react-resizable from 3.0.5 to 3.0.6 Merge conflict check #3709: Pull request #1197 synchronize by dependabot bot
November 1, 2023 09:56 20s
November 1, 2023 09:56 20s
Bump @types/react-beforeunload from 2.1.2 to 2.1.3 Merge conflict check #3708: Pull request #1196 synchronize by dependabot bot
November 1, 2023 09:56 25s
November 1, 2023 09:56 25s
Bump @types/react-final-form-listeners from 1.0.1 to 1.0.2 Merge conflict check #3707: Pull request #1195 synchronize by dependabot bot
November 1, 2023 09:56 11s
November 1, 2023 09:56 11s
Bump @types/react-beforeunload from 2.1.2 to 2.1.3 Merge conflict check #3705: Commit cc03ca2 pushed by dependabot bot
November 1, 2023 09:56 11s dependabot/npm_and_yarn/types/react-beforeunload-2.1.3
dependabot/npm_and_yarn/types/react-beforeunload-2.1.3
November 1, 2023 09:56 11s
Bump @types/react-resizable from 3.0.5 to 3.0.6 Merge conflict check #3706: Commit 8dbe0a6 pushed by dependabot bot
November 1, 2023 09:56 14s dependabot/npm_and_yarn/types/react-resizable-3.0.6
dependabot/npm_and_yarn/types/react-resizable-3.0.6
November 1, 2023 09:56 14s