Skip to content

Actions: ziegenberg/opencast

Actions

Merge conflict check

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Update documentation on Consensus Building and Lazy Consensus after P… Merge conflict check #1728: Commit 3f28faa pushed by ziegenberg
December 3, 2024 16:28 13s t/update-docs-after-pr-6297
t/update-docs-after-pr-6297
December 3, 2024 16:28 13s
Merge r/17.x into develop Merge conflict check #1727: Commit e626f16 pushed by ziegenberg
December 3, 2024 16:13 17s develop
develop
December 3, 2024 16:13 17s
Update documentation on Consensus Building and Lazy Consensus after P… Merge conflict check #1726: Commit 4437259 pushed by ziegenberg
November 26, 2024 17:50 11s t/update-docs-after-pr-6297
t/update-docs-after-pr-6297
November 26, 2024 17:50 11s
Proposal: Require 2FA for all committers Merge conflict check #1725: Commit cea7d1b pushed by ziegenberg
November 26, 2024 17:19 10s t/proposal-mandatory-2fa
t/proposal-mandatory-2fa
November 26, 2024 17:19 10s
Update documentation about how to create a release (#6320) Merge conflict check #1724: Commit fab8535 pushed by ziegenberg
November 26, 2024 16:04 21s develop
develop
November 26, 2024 16:04 21s
Merge r/15.x into r/16.x Merge conflict check #1723: Commit c668d14 pushed by ziegenberg
May 23, 2024 10:20 10s r/16.x
r/16.x
May 23, 2024 10:20 10s
Merge branch 'r/14.x' of github.com:opencast/opencast into r/14.x Merge conflict check #1722: Commit f68c0fb pushed by ziegenberg
May 23, 2024 10:20 11s r/14.x
r/14.x
May 23, 2024 10:20 11s
Add releasenotes and changelog for 15.5 (#5854) Merge conflict check #1721: Commit e55a32e pushed by ziegenberg
May 23, 2024 10:20 12s r/15.x
r/15.x
May 23, 2024 10:20 12s
Automatically update translation keys (develop) Merge conflict check #1720: Commit 2538aef pushed by ziegenberg
May 23, 2024 10:18 13s develop
develop
May 23, 2024 10:18 13s
Update (New) Admin UI to 2024-05-08 Merge conflict check #1719: Commit 429fbf6 pushed by ziegenberg
May 7, 2024 22:56 14s update-admin-interface
update-admin-interface
May 7, 2024 22:56 14s
Update (New) Admin UI to 2024-05-08 Merge conflict check #1718: Commit 21e3930 pushed by ziegenberg
May 7, 2024 22:28 12s update-admin-interface
update-admin-interface
May 7, 2024 22:28 12s
Update (New) Admin UI to 2024-05-07 Merge conflict check #1717: Commit 8816295 pushed by ziegenberg
May 7, 2024 15:35 11s update-admin-interface
update-admin-interface
May 7, 2024 15:35 11s
Merge branch 'harvest-ocr' of owi92/opencast into r/15.x Merge conflict check #1716: Commit 40cd08e pushed by ziegenberg
May 7, 2024 15:24 10s r/15.x
r/15.x
May 7, 2024 15:24 10s
Merge branch 'fix-manually-deleting-aai-users' of JulianKniephoff/ope… Merge conflict check #1715: Commit e8a4591 pushed by ziegenberg
May 7, 2024 15:24 11s r/14.x
r/14.x
May 7, 2024 15:24 11s
Automatically update translation keys (r/13.x) Merge conflict check #1714: Commit 710e120 pushed by ziegenberg
May 7, 2024 15:23 11s r/13.x
r/13.x
May 7, 2024 15:23 11s
Bump react-dom and @types/react-dom in /modules/lti (#5786) Merge conflict check #1713: Commit 9fdad06 pushed by ziegenberg
May 7, 2024 15:23 20s develop
develop
May 7, 2024 15:23 20s
Update babel monorepo Merge conflict check #1712: Pull request #339 synchronize by ziegenberg
April 29, 2024 20:06 16s
April 29, 2024 20:06 16s
Update babel monorepo Merge conflict check #1711: Commit 89f644e pushed by ziegenberg
April 29, 2024 20:06 14s test-renovate2/babel-monorepo
test-renovate2/babel-monorepo
April 29, 2024 20:06 14s
Pin dependencies Merge conflict check #1710: Pull request #338 synchronize by ziegenberg
April 27, 2024 05:18 11s
April 27, 2024 05:18 11s
Pin dependencies Merge conflict check #1709: Commit fcb59a9 pushed by ziegenberg
April 27, 2024 05:18 11s test-renovate2/font-awesome
test-renovate2/font-awesome
April 27, 2024 05:18 11s
Pin dependencies Merge conflict check #1708: Pull request #337 synchronize by ziegenberg
April 27, 2024 05:18 2m 13s
April 27, 2024 05:18 2m 13s
Pin dependencies Merge conflict check #1707: Commit 18501d0 pushed by ziegenberg
April 27, 2024 05:18 11s test-renovate2/pin-dependencies
test-renovate2/pin-dependencies
April 27, 2024 05:18 11s
Update dependency paella-core to v1.48.2 Merge conflict check #1706: Pull request #343 synchronize by ziegenberg
April 24, 2024 15:06 15s
April 24, 2024 15:06 15s
Update dependency paella-core to v1.48.2 Merge conflict check #1705: Commit d937532 pushed by ziegenberg
April 24, 2024 15:06 14s test-renovate2/paella-core-1.x
test-renovate2/paella-core-1.x
April 24, 2024 15:06 14s
Update babel monorepo Merge conflict check #1704: Pull request #339 synchronize by ziegenberg
April 3, 2024 20:06 10s
April 3, 2024 20:06 10s