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
783 workflow runs
783 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Bump eslint from 8.56.0 to 9.6.0 Merge conflict check #4414: Pull request #1405 opened by dependabot bot
July 1, 2024 04:59 13s
July 1, 2024 04:59 13s
Bump eslint from 8.56.0 to 9.6.0 Merge conflict check #4413: Commit dd06a2d pushed by dependabot bot
July 1, 2024 04:59 11s dependabot/npm_and_yarn/eslint-9.6.0
dependabot/npm_and_yarn/eslint-9.6.0
July 1, 2024 04:59 11s
Bump uuid and @types/uuid Merge conflict check #4412: Pull request #1404 opened by dependabot bot
July 1, 2024 04:58 12s
July 1, 2024 04:58 12s
Bump uuid and @types/uuid Merge conflict check #4411: Commit 18f3202 pushed by dependabot bot
July 1, 2024 04:58 11s dependabot/npm_and_yarn/multi-87b2ad6fb3
dependabot/npm_and_yarn/multi-87b2ad6fb3
July 1, 2024 04:58 11s
Bump eslint-plugin-react from 7.34.2 to 7.34.3 Merge conflict check #4410: Pull request #1403 opened by dependabot bot
July 1, 2024 04:58 13s
July 1, 2024 04:58 13s
Bump eslint-plugin-react from 7.34.2 to 7.34.3 Merge conflict check #4409: Commit a243bd9 pushed by dependabot bot
July 1, 2024 04:58 13s dependabot/npm_and_yarn/eslint-plugin-react-7.34.3
dependabot/npm_and_yarn/eslint-plugin-react-7.34.3
July 1, 2024 04:58 13s
Bump vite from 5.2.12 to 5.3.2 Merge conflict check #4408: Pull request #1402 opened by dependabot bot
July 1, 2024 04:57 10s
July 1, 2024 04:57 10s
Bump vite from 5.2.12 to 5.3.2 Merge conflict check #4407: Commit fb7daee pushed by dependabot bot
July 1, 2024 04:57 9s dependabot/npm_and_yarn/vite-5.3.2
dependabot/npm_and_yarn/vite-5.3.2
July 1, 2024 04:57 9s
Bump @testing-library/jest-dom from 6.4.5 to 6.4.6 Merge conflict check #4406: Pull request #1401 opened by dependabot bot
July 1, 2024 04:57 9s
July 1, 2024 04:57 9s
Bump @testing-library/jest-dom from 6.4.5 to 6.4.6 Merge conflict check #4405: Commit 665b5be pushed by dependabot bot
July 1, 2024 04:57 9s dependabot/npm_and_yarn/testing-library/jest-dom-6.4.6
dependabot/npm_and_yarn/testing-library/jest-dom-6.4.6
July 1, 2024 04:57 9s
Bump @playwright/test from 1.44.1 to 1.45.0 Merge conflict check #4404: Pull request #1400 opened by dependabot bot
July 1, 2024 04:57 12s
July 1, 2024 04:57 12s
Bump @playwright/test from 1.44.1 to 1.45.0 Merge conflict check #4403: Commit 90915ad pushed by dependabot bot
July 1, 2024 04:57 12s dependabot/npm_and_yarn/playwright/test-1.45.0
dependabot/npm_and_yarn/playwright/test-1.45.0
July 1, 2024 04:57 12s
Bump softprops/turnstyle from 1 to 2 Merge conflict check #4402: Pull request #1399 opened by dependabot bot
July 1, 2024 01:22 15s
July 1, 2024 01:22 15s
Bump softprops/turnstyle from 1 to 2 Merge conflict check #4401: Commit cda8235 pushed by dependabot bot
July 1, 2024 01:22 10s dependabot/github_actions/softprops/turnstyle-2
dependabot/github_actions/softprops/turnstyle-2
July 1, 2024 01:22 10s
Make use of ProtoButton from appkit Merge conflict check #4400: Pull request #1393 opened by Arnei
June 27, 2024 14:56 13s
June 27, 2024 14:56 13s
Make use of error boxes from appkit Merge conflict check #4399: Pull request #1392 opened by Arnei
June 27, 2024 11:02 14s
June 27, 2024 11:02 14s
Split track selection to video and audio selection Merge conflict check #4398: Pull request #1230 synchronize by Arnei
June 27, 2024 09:18 11s
June 27, 2024 09:18 11s
Split track selection to video and audio selection Merge conflict check #4397: Pull request #1230 synchronize by Arnei
June 27, 2024 09:10 12s
June 27, 2024 09:10 12s
Split track selection to video and audio selection Merge conflict check #4396: Pull request #1230 synchronize by Arnei
June 27, 2024 09:04 15s
June 27, 2024 09:04 15s
Replace our spinner with appkits spinner Merge conflict check #4395: Pull request #1390 opened by Arnei
June 26, 2024 15:33 14s
June 26, 2024 15:33 14s
Split track selection to video and audio selection Merge conflict check #4394: Pull request #1230 synchronize by Arnei
June 26, 2024 15:03 17s
June 26, 2024 15:03 17s
Merge pull request #1033 from Arnei/zoom-timeline-revival Merge conflict check #4393: Commit b321cf9 pushed by Arnei
June 25, 2024 11:50 2m 16s main
main
June 25, 2024 11:50 2m 16s
Split track selection to video and audio selection Merge conflict check #4392: Pull request #1230 synchronize by Arnei
June 21, 2024 10:43 12s
June 21, 2024 10:43 12s
More small screen responsiveness Merge conflict check #4391: Pull request #1160 synchronize by Arnei
June 21, 2024 10:40 13s
June 21, 2024 10:40 13s
Merge pull request #1387 from JulianKniephoff/remove-flex-gap-polyfill Merge conflict check #4390: Commit 7d8a616 pushed by Arnei
June 21, 2024 10:32 2m 12s main
main
June 21, 2024 10:32 2m 12s
ProTip! You can narrow down the results and go further in time using created:<2024-06-21 or the other filters available.