Skip to content

Actions: UoM-Podcast/opencast-editor

Actions

Merge conflict check

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
check-merge-conflict.yml
47 workflow runs
47 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge branch 'uom/staging' into uom/production Merge conflict check #125: Commit a5a7fb4 pushed by JamesUoM
January 15, 2025 19:01 10s uom/production
uom/production
January 15, 2025 19:01 10s
MO-854, refactor to just use a selector Merge conflict check #124: Commit 7858442 pushed by JamesUoM
January 15, 2025 19:00 13s uom/staging
uom/staging
January 15, 2025 19:00 13s
MO-854, refactor to just use a selector Merge conflict check #123: Commit 7858442 pushed by JamesUoM
January 15, 2025 16:41 14s uom/develop
uom/develop
January 15, 2025 16:41 14s
#1512, refactor cutting validation Merge conflict check #122: Commit 51cf5c7 pushed by JamesUoM
December 18, 2024 14:09 13s f/catch-video-deletion
f/catch-video-deletion
December 18, 2024 14:09 13s
MO-854, customize message Merge conflict check #121: Commit 7feb6b8 pushed by JamesUoM
December 11, 2024 15:45 14s uom/develop
uom/develop
December 11, 2024 15:45 14s
MO-854, customize message Merge conflict check #120: Commit b05fdc5 pushed by JamesUoM
December 11, 2024 15:44 12s uom/develop
uom/develop
December 11, 2024 15:44 12s
MO-854, add contact details to invalid edit text Merge conflict check #119: Commit 3d11dba pushed by JamesUoM
December 11, 2024 13:03 14s uom/develop
uom/develop
December 11, 2024 13:03 14s
MO-854, don't save edits with no clips Merge conflict check #118: Commit 9874fcf pushed by JamesUoM
December 11, 2024 11:58 10s uom/develop
uom/develop
December 11, 2024 11:58 10s
Fixes #1512, don't save edits with no clips Merge conflict check #117: Commit f0c2479 pushed by JamesUoM
December 11, 2024 11:41 13s f/catch-video-deletion
f/catch-video-deletion
December 11, 2024 11:41 13s
Fixes #1512, don't save edits with no clips Merge conflict check #116: Commit ab919e8 pushed by JamesUoM
December 11, 2024 11:31 10s f/catch-video-deletion
f/catch-video-deletion
December 11, 2024 11:31 10s
Merge pull request #1511 from geichelberger/delete-subtitles Merge conflict check #115: Commit 6c2e214 pushed by JamesUoM
December 11, 2024 11:18 2m 12s main
main
December 11, 2024 11:18 2m 12s
WIP Merge conflict check #114: Commit 769eea6 pushed by JamesUoM
December 10, 2024 18:14 1m 30s t/MAT-XXX-bad-edit
t/MAT-XXX-bad-edit
December 10, 2024 18:14 1m 30s
Merge branch 'uom/staging' into uom/production Merge conflict check #113: Commit 871b54f pushed by JamesUoM
September 3, 2024 13:21 12s uom/production
uom/production
September 3, 2024 13:21 12s
MAT-563, fix wrong status Merge conflict check #112: Commit ef7c14f pushed by JamesUoM
August 23, 2024 09:47 14s uom/staging
uom/staging
August 23, 2024 09:47 14s
MAT-563, fix wrong status Merge conflict check #111: Commit ef7c14f pushed by JamesUoM
August 19, 2024 15:20 14s uom/develop
uom/develop
August 19, 2024 15:20 14s
MAT-563, uom specific changes Merge conflict check #110: Commit fe3086a pushed by JamesUoM
August 19, 2024 14:57 11s uom/staging
uom/staging
August 19, 2024 14:57 11s
MAT-563, uom specific changes Merge conflict check #109: Commit fe3086a pushed by JamesUoM
August 19, 2024 14:45 11s uom/develop
uom/develop
August 19, 2024 14:45 11s
MAT-563, uom specific changes Merge conflict check #108: Commit fe3086a pushed by JamesUoM
August 19, 2024 14:11 16s uom/production
uom/production
August 19, 2024 14:11 16s
MAT-554, apply show settings to shortcuts Merge conflict check #107: Commit 7a1e08c pushed by JamesUoM
July 22, 2024 13:39 12s uom/production
uom/production
July 22, 2024 13:39 12s
[Snyk] Upgrade @mui/material from 5.15.19 to 5.15.20 Merge conflict check #106: Pull request #9 opened by JamesUoM
July 13, 2024 01:20 10s
July 13, 2024 01:20 10s
fix: upgrade @mui/material from 5.15.19 to 5.15.20 Merge conflict check #105: Commit 9045f6e pushed by JamesUoM
July 13, 2024 01:20 10s snyk-upgrade-fd22412ec4cecc319bb657a471106053
snyk-upgrade-fd22412ec4cecc319bb657a471106053
July 13, 2024 01:20 10s
Merge pull request #1229 from Arnei/upload-subtitles Merge conflict check #104: Commit 44afe77 pushed by JamesUoM
July 13, 2024 01:20 12s snyk-upgrade-fd22412ec4cecc319bb657a471106053
snyk-upgrade-fd22412ec4cecc319bb657a471106053
July 13, 2024 01:20 12s
[Snyk] Upgrade typescript from 5.4.5 to 5.5.2 Merge conflict check #103: Pull request #8 opened by JamesUoM
July 11, 2024 20:29 14s
July 11, 2024 20:29 14s
fix: upgrade typescript from 5.4.5 to 5.5.2 Merge conflict check #102: Commit 198ebaf pushed by JamesUoM
July 11, 2024 20:29 17s snyk-upgrade-4c505b1cbd07f4996e86fd7138789447
snyk-upgrade-4c505b1cbd07f4996e86fd7138789447
July 11, 2024 20:29 17s
Merge pull request #1229 from Arnei/upload-subtitles Merge conflict check #101: Commit 44afe77 pushed by JamesUoM
July 11, 2024 20:29 14s snyk-upgrade-4c505b1cbd07f4996e86fd7138789447
snyk-upgrade-4c505b1cbd07f4996e86fd7138789447
July 11, 2024 20:29 14s