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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #1171 from opencast/dependabot/npm_and_yarn/uuid-a… Merge conflict check #3618: Commit 0588b09 pushed by Arnei
October 5, 2023 09:19 10s main
main
October 5, 2023 09:19 10s
Bump luxon from 3.4.2 to 3.4.3 Merge conflict check #3617: Pull request #1167 synchronize by dependabot bot
October 5, 2023 09:19 2m 13s
October 5, 2023 09:19 2m 13s
Bump luxon from 3.4.2 to 3.4.3 Merge conflict check #3616: Commit c64deed pushed by dependabot bot
October 5, 2023 09:19 13s dependabot/npm_and_yarn/luxon-3.4.3
dependabot/npm_and_yarn/luxon-3.4.3
October 5, 2023 09:19 13s
Merge pull request #1173 from opencast/dependabot/npm_and_yarn/types/… Merge conflict check #3615: Commit 1b1aa76 pushed by Arnei
October 5, 2023 09:18 2m 15s main
main
October 5, 2023 09:18 2m 15s
Bump @types/react-beforeunload from 2.1.1 to 2.1.2 Merge conflict check #3614: Pull request #1173 synchronize by dependabot bot
October 5, 2023 09:15 11s
October 5, 2023 09:15 11s
Bump @types/react-beforeunload from 2.1.1 to 2.1.2 Merge conflict check #3613: Commit 5a52a55 pushed by dependabot bot
October 5, 2023 09:15 11s dependabot/npm_and_yarn/types/react-beforeunload-2.1.2
dependabot/npm_and_yarn/types/react-beforeunload-2.1.2
October 5, 2023 09:15 11s
Bump @types/react-final-form-listeners from 1.0.0 to 1.0.1 Merge conflict check #3611: Commit 7c01328 pushed by dependabot bot
October 5, 2023 09:15 11s dependabot/npm_and_yarn/types/react-final-form-listeners-1.0.1
dependabot/npm_and_yarn/types/react-final-form-listeners-1.0.1
October 5, 2023 09:15 11s
Bump @types/react-final-form-listeners from 1.0.0 to 1.0.1 Merge conflict check #3612: Pull request #1172 synchronize by dependabot bot
October 5, 2023 09:15 16s
October 5, 2023 09:15 16s
Bump luxon from 3.4.2 to 3.4.3 Merge conflict check #3609: Commit e5b49d8 pushed by dependabot bot
October 5, 2023 09:15 14s dependabot/npm_and_yarn/luxon-3.4.3
dependabot/npm_and_yarn/luxon-3.4.3
October 5, 2023 09:15 14s
Bump luxon from 3.4.2 to 3.4.3 Merge conflict check #3610: Pull request #1167 synchronize by dependabot bot
October 5, 2023 09:15 13s
October 5, 2023 09:15 13s
Bump @reduxjs/toolkit from 1.9.5 to 1.9.7 Merge conflict check #3608: Commit 8097b6d pushed by dependabot bot
October 5, 2023 09:14 12s dependabot/npm_and_yarn/reduxjs/toolkit-1.9.7
dependabot/npm_and_yarn/reduxjs/toolkit-1.9.7
October 5, 2023 09:14 12s
Bump @reduxjs/toolkit from 1.9.5 to 1.9.7 Merge conflict check #3607: Pull request #1181 opened by dependabot bot
October 5, 2023 09:14 13s
October 5, 2023 09:14 13s
Bump @testing-library/jest-dom from 6.1.2 to 6.1.3 Merge conflict check #3606: Pull request #1169 synchronize by dependabot bot
October 5, 2023 09:14 17s
October 5, 2023 09:14 17s
Bump @testing-library/jest-dom from 6.1.2 to 6.1.3 Merge conflict check #3605: Commit 342f4a7 pushed by dependabot bot
October 5, 2023 09:14 16s dependabot/npm_and_yarn/testing-library/jest-dom-6.1.3
dependabot/npm_and_yarn/testing-library/jest-dom-6.1.3
October 5, 2023 09:14 16s
Merge pull request #1174 from opencast/dependabot/npm_and_yarn/types/… Merge conflict check #3604: Commit 1254c61 pushed by Arnei
October 5, 2023 09:14 2m 15s main
main
October 5, 2023 09:14 2m 15s
Bump @types/react-dom from 18.2.7 to 18.2.10 Merge conflict check #3602: Pull request #1180 opened by dependabot bot
October 5, 2023 09:13 16s
October 5, 2023 09:13 16s
Bump @types/react-dom from 18.2.7 to 18.2.10 Merge conflict check #3603: Commit c28f62a pushed by dependabot bot
October 5, 2023 09:13 15s dependabot/npm_and_yarn/types/react-dom-18.2.10
dependabot/npm_and_yarn/types/react-dom-18.2.10
October 5, 2023 09:13 15s
Merge pull request #1177 from opencast/dependabot/npm_and_yarn/types/… Merge conflict check #3601: Commit 177907a pushed by Arnei
October 5, 2023 09:13 2m 16s main
main
October 5, 2023 09:13 2m 16s
Merge pull request #1102 from UoM-Podcast/f/editor-lock Merge conflict check #3600: Commit c2147ae pushed by Arnei
October 5, 2023 09:05 2m 14s main
main
October 5, 2023 09:05 2m 14s
Merge pull request #1060 from dennis531/volume-control Merge conflict check #3599: Commit 4fa1564 pushed by Arnei
October 5, 2023 09:01 2m 21s main
main
October 5, 2023 09:01 2m 21s
fix #997, correct workflow ordering Merge conflict check #3598: Pull request #1179 opened by JamesUoM
October 4, 2023 14:28 25s
October 4, 2023 14:28 25s
Implement editor locking so only one person can edit a recording a time Merge conflict check #3597: Pull request #1102 synchronize by JamesUoM
October 4, 2023 14:00 16s
October 4, 2023 14:00 16s
Implement editor locking so only one person can edit a recording a time Merge conflict check #3596: Pull request #1102 synchronize by JamesUoM
October 4, 2023 12:50 17s
October 4, 2023 12:50 17s
Bump @types/react from 18.2.21 to 18.2.24 Merge conflict check #3595: Pull request #1177 opened by dependabot bot
October 2, 2023 15:22 15s
October 2, 2023 15:22 15s
Bump @types/react from 18.2.21 to 18.2.24 Merge conflict check #3594: Commit 26de44e pushed by dependabot bot
October 2, 2023 15:22 12s dependabot/npm_and_yarn/types/react-18.2.24
dependabot/npm_and_yarn/types/react-18.2.24
October 2, 2023 15:22 12s
ProTip! You can narrow down the results and go further in time using created:<2023-10-02 or the other filters available.