Skip to content

Actions: opencast/studio

Actions

Merge conflict check

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Build(deps): Bump the minor-and-patch group with 5 updates Merge conflict check #1768: Pull request #1277 opened by dependabot bot
6s
6s
Build(deps): Bump the minor-and-patch group with 5 updates Merge conflict check #1767: Commit 6990f4d pushed by dependabot bot
7s dependabot/npm_and_yarn/minor-and-patch-9feed8d3e5
dependabot/npm_and_yarn/minor-and-patch-9feed8d3e5
7s
Build(deps-dev): Bump node-forge from 1.3.1 to 1.3.2 (#1276) Merge conflict check #1766: Commit 048155c pushed by LukasKalbertodt
2m 10s main
main
2m 10s
Build(deps-dev): Bump node-forge from 1.3.1 to 1.3.2 Merge conflict check #1765: Pull request #1276 opened by dependabot bot
9s
9s
Build(deps-dev): Bump node-forge from 1.3.1 to 1.3.2 Merge conflict check #1764: Commit 8b7297b pushed by dependabot bot
6s dependabot/npm_and_yarn/node-forge-1.3.2
dependabot/npm_and_yarn/node-forge-1.3.2
6s
Run npm update --save Merge conflict check #1763: Commit b8eeaa5 pushed by LukasKalbertodt
9s 2025-11-19
2025-11-19
9s
Run npm update --save Merge conflict check #1762: Commit b8eeaa5 pushed by LukasKalbertodt
2m 10s main
main
2m 10s
Update to React 19 (and get rid of some dependencies) (#1269) Merge conflict check #1761: Commit 1c54bff pushed by LukasKalbertodt
2m 10s main
main
2m 10s
Build(deps): Bump js-yaml from 4.1.0 to 4.1.1 (#1275) Merge conflict check #1760: Commit 020b9c7 pushed by LukasKalbertodt
2m 8s main
main
2m 8s
Build(deps): Bump js-yaml from 4.1.0 to 4.1.1 Merge conflict check #1759: Pull request #1275 opened by dependabot bot
6s
6s
Build(deps): Bump js-yaml from 4.1.0 to 4.1.1 Merge conflict check #1758: Commit 448f3b2 pushed by dependabot bot
9s dependabot/npm_and_yarn/js-yaml-4.1.1
dependabot/npm_and_yarn/js-yaml-4.1.1
9s
Build(deps): Bump actions/upload-artifact from 4 to 5 (#1274) Merge conflict check #1757: Commit 89ae7bf pushed by LukasKalbertodt
2m 9s main
main
2m 9s
Build(deps): Bump actions/setup-node from 5 to 6 (#1273) Merge conflict check #1756: Commit f22b8b0 pushed by LukasKalbertodt
2m 7s main
main
2m 7s
Build(deps): Bump actions/upload-artifact from 4 to 5 Merge conflict check #1755: Pull request #1274 opened by dependabot bot
6s
6s
Build(deps): Bump actions/upload-artifact from 4 to 5 Merge conflict check #1754: Commit 7b85689 pushed by dependabot bot
6s dependabot/github_actions/actions/upload-artifact-5
dependabot/github_actions/actions/upload-artifact-5
6s
Build(deps): Bump actions/setup-node from 5 to 6 Merge conflict check #1753: Pull request #1273 opened by dependabot bot
8s
8s
Build(deps): Bump actions/setup-node from 5 to 6 Merge conflict check #1752: Commit 4d2eadd pushed by dependabot bot
9s dependabot/github_actions/actions/setup-node-6
dependabot/github_actions/actions/setup-node-6
9s
Build(deps): Bump react and @types/react Merge conflict check #1751: Pull request #1272 opened by dependabot bot
7s
7s
Build(deps): Bump react and @types/react Merge conflict check #1750: Commit f727634 pushed by dependabot bot
9s dependabot/npm_and_yarn/multi-c808d207fc
dependabot/npm_and_yarn/multi-c808d207fc
9s
Build(deps): Bump react-dom and @types/react-dom Merge conflict check #1749: Pull request #1271 opened by dependabot bot
10s
10s
Build(deps): Bump react-dom and @types/react-dom Merge conflict check #1748: Commit c3e5c9e pushed by dependabot bot
7s dependabot/npm_and_yarn/multi-82db6e5206
dependabot/npm_and_yarn/multi-82db6e5206
7s
Build(deps): Bump the minor-and-patch group with 12 updates Merge conflict check #1747: Pull request #1270 opened by dependabot bot
6s
6s
Build(deps): Bump the minor-and-patch group with 12 updates Merge conflict check #1746: Commit 3df9901 pushed by dependabot bot
6s dependabot/npm_and_yarn/minor-and-patch-9535610fac
dependabot/npm_and_yarn/minor-and-patch-9535610fac
6s
Update to React 19 (and get rid of some dependencies) Merge conflict check #1745: Pull request #1269 opened by LukasKalbertodt
7s
7s
Build(deps): Bump actions/setup-node from 4 to 5 (#1268) Merge conflict check #1744: Commit 34b8417 pushed by LukasKalbertodt
2m 6s main
main
2m 6s