Skip to content

Actions: opencast/pyCA

Actions

Merge Conflict Check

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Bump eslint from 9.5.0 to 9.8.0 Merge Conflict Check #653: Commit 9f386fd pushed by dependabot bot
August 1, 2024 21:12 10s dependabot/npm_and_yarn/eslint-9.8.0
dependabot/npm_and_yarn/eslint-9.8.0
August 1, 2024 21:12 10s
Bump @eslint/js from 9.5.0 to 9.8.0 Merge Conflict Check #652: Commit 308deef pushed by dependabot bot
August 1, 2024 21:12 11s dependabot/npm_and_yarn/eslint/js-9.8.0
dependabot/npm_and_yarn/eslint/js-9.8.0
August 1, 2024 21:12 11s
Bump @vue/compiler-sfc from 3.4.27 to 3.4.35 Merge Conflict Check #651: Commit 640381a pushed by dependabot bot
August 1, 2024 21:11 14s dependabot/npm_and_yarn/vue/compiler-sfc-3.4.35
dependabot/npm_and_yarn/vue/compiler-sfc-3.4.35
August 1, 2024 21:11 14s
Bump vue from 3.4.27 to 3.4.35 Merge Conflict Check #650: Commit c236f34 pushed by dependabot bot
August 1, 2024 21:11 10s dependabot/npm_and_yarn/vue-3.4.35
dependabot/npm_and_yarn/vue-3.4.35
August 1, 2024 21:11 10s
Bump globals from 15.6.0 to 15.9.0 Merge Conflict Check #649: Commit d8a2052 pushed by dependabot bot
August 1, 2024 21:11 18s dependabot/npm_and_yarn/globals-15.9.0
dependabot/npm_and_yarn/globals-15.9.0
August 1, 2024 21:11 18s
Bump globals from 15.6.0 to 15.7.0 Merge Conflict Check #648: Commit 5646159 pushed by dependabot bot
July 1, 2024 21:05 1m 2s dependabot/npm_and_yarn/globals-15.7.0
dependabot/npm_and_yarn/globals-15.7.0
July 1, 2024 21:05 1m 2s
Bump @vue/compiler-sfc from 3.4.27 to 3.4.31 Merge Conflict Check #647: Commit d9bf0ea pushed by dependabot bot
July 1, 2024 21:05 12s dependabot/npm_and_yarn/vue/compiler-sfc-3.4.31
dependabot/npm_and_yarn/vue/compiler-sfc-3.4.31
July 1, 2024 21:05 12s
Bump eslint from 9.5.0 to 9.6.0 Merge Conflict Check #646: Commit b302a31 pushed by dependabot bot
July 1, 2024 21:04 12s dependabot/npm_and_yarn/eslint-9.6.0
dependabot/npm_and_yarn/eslint-9.6.0
July 1, 2024 21:04 12s
Bump vue from 3.4.27 to 3.4.31 Merge Conflict Check #645: Commit f4708ee pushed by dependabot bot
July 1, 2024 21:04 11s dependabot/npm_and_yarn/vue-3.4.31
dependabot/npm_and_yarn/vue-3.4.31
July 1, 2024 21:04 11s
Bump @eslint/js from 9.5.0 to 9.6.0 Merge Conflict Check #644: Commit cdef2ce pushed by dependabot bot
July 1, 2024 21:04 12s dependabot/npm_and_yarn/eslint/js-9.6.0
dependabot/npm_and_yarn/eslint/js-9.6.0
July 1, 2024 21:04 12s
Updates to container images Merge Conflict Check #643: Pull request #530 synchronize by mtneug
July 1, 2024 14:00 16s
July 1, 2024 14:00 16s
Clear logging handler when initializing the logger Merge Conflict Check #642: Commit 8454b91 pushed by lkiesow
June 18, 2024 14:51 2m 16s main
main
June 18, 2024 14:51 2m 16s
Bump globals from 15.2.0 to 15.6.0 Merge Conflict Check #641: Commit c63610f pushed by lkiesow
June 18, 2024 14:20 11s main
main
June 18, 2024 14:20 11s
Use Basic Auth by Default Merge Conflict Check #640: Commit f753b51 pushed by lkiesow
June 18, 2024 14:18 4m 12s main
main
June 18, 2024 14:18 4m 12s
Bump braces from 3.0.2 to 3.0.3 Merge Conflict Check #639: Commit 48dc9c9 pushed by lkiesow
June 18, 2024 14:16 2m 14s main
main
June 18, 2024 14:16 2m 14s
Add option to use cookies Merge Conflict Check #638: Commit 4ee4650 pushed by lkiesow
June 18, 2024 14:15 2m 12s main
main
June 18, 2024 14:15 2m 12s
Add options to set HTTP timeouts Merge Conflict Check #637: Commit 56a2696 pushed by lkiesow
June 18, 2024 14:13 2m 11s main
main
June 18, 2024 14:13 2m 11s
Clear logging handler when initializing the logger Merge Conflict Check #636: Pull request #529 synchronize by lkiesow
June 18, 2024 14:08 10s
June 18, 2024 14:08 10s
Bump globals from 15.2.0 to 15.6.0 Merge Conflict Check #635: Commit 21eab11 pushed by dependabot bot
June 18, 2024 14:02 10s dependabot/npm_and_yarn/globals-15.6.0
dependabot/npm_and_yarn/globals-15.6.0
June 18, 2024 14:02 10s
Bump eslint from 9.2.0 to 9.5.0 Merge Conflict Check #634: Commit 9288236 pushed by lkiesow
June 18, 2024 14:01 2m 11s main
main
June 18, 2024 14:01 2m 11s
Bump eslint from 9.2.0 to 9.5.0 Merge Conflict Check #633: Commit e74d1ab pushed by dependabot bot
June 18, 2024 13:38 34s dependabot/npm_and_yarn/eslint-9.5.0
dependabot/npm_and_yarn/eslint-9.5.0
June 18, 2024 13:38 34s
Bump braces from 3.0.2 to 3.0.3 Merge Conflict Check #632: Commit 0d52e67 pushed by dependabot bot
June 18, 2024 13:37 11s dependabot/npm_and_yarn/braces-3.0.3
dependabot/npm_and_yarn/braces-3.0.3
June 18, 2024 13:37 11s
Bump @fortawesome/vue-fontawesome from 3.0.6 to 3.0.8 Merge Conflict Check #631: Commit 88c5ea8 pushed by lkiesow
June 18, 2024 13:37 2m 12s main
main
June 18, 2024 13:37 2m 12s
Bump @eslint/js from 9.2.0 to 9.4.0 Merge Conflict Check #630: Commit 91c367c pushed by lkiesow
June 18, 2024 13:37 2m 15s main
main
June 18, 2024 13:37 2m 15s
Bump globals from 15.2.0 to 15.3.0 Merge Conflict Check #629: Commit f2a9a3f pushed by dependabot bot
June 1, 2024 21:03 12s dependabot/npm_and_yarn/globals-15.3.0
dependabot/npm_and_yarn/globals-15.3.0
June 1, 2024 21:03 12s