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-plugin-vue from 9.26.0 to 9.30.0 Merge Conflict Check #678: Commit 19beea3 pushed by dependabot bot
November 1, 2024 21:56 1m 7s dependabot/npm_and_yarn/eslint-plugin-vue-9.30.0
dependabot/npm_and_yarn/eslint-plugin-vue-9.30.0
November 1, 2024 21:56 1m 7s
Bump @eslint/js from 9.9.1 to 9.14.0 Merge Conflict Check #677: Commit 0dfd40f pushed by dependabot bot
November 1, 2024 21:56 11s dependabot/npm_and_yarn/eslint/js-9.14.0
dependabot/npm_and_yarn/eslint/js-9.14.0
November 1, 2024 21:56 11s
Bump eslint from 9.9.1 to 9.14.0 Merge Conflict Check #676: Commit b2bebdf pushed by dependabot bot
November 1, 2024 21:56 12s dependabot/npm_and_yarn/eslint-9.14.0
dependabot/npm_and_yarn/eslint-9.14.0
November 1, 2024 21:56 12s
Bump vue from 3.4.27 to 3.5.12 Merge Conflict Check #675: Commit f04eb8f pushed by dependabot bot
November 1, 2024 21:56 13s dependabot/npm_and_yarn/vue-3.5.12
dependabot/npm_and_yarn/vue-3.5.12
November 1, 2024 21:56 13s
Bump @eslint/js from 9.9.1 to 9.11.1 Merge Conflict Check #674: Commit 193c16d pushed by dependabot bot
October 1, 2024 21:16 46s dependabot/npm_and_yarn/eslint/js-9.11.1
dependabot/npm_and_yarn/eslint/js-9.11.1
October 1, 2024 21:16 46s
Bump vue from 3.4.27 to 3.5.10 Merge Conflict Check #673: Commit 16be12c pushed by dependabot bot
October 1, 2024 21:16 9s dependabot/npm_and_yarn/vue-3.5.10
dependabot/npm_and_yarn/vue-3.5.10
October 1, 2024 21:16 9s
Bump eslint from 9.9.1 to 9.11.1 Merge Conflict Check #672: Commit aca87e5 pushed by dependabot bot
October 1, 2024 21:16 11s dependabot/npm_and_yarn/eslint-9.11.1
dependabot/npm_and_yarn/eslint-9.11.1
October 1, 2024 21:16 11s
Bump @fortawesome/fontawesome-svg-core from 6.5.2 to 6.6.0 Merge Conflict Check #671: Commit 5cde00e pushed by dependabot bot
October 1, 2024 21:16 13s dependabot/npm_and_yarn/fortawesome/fontawesome-svg-core-6.6.0
dependabot/npm_and_yarn/fortawesome/fontawesome-svg-core-6.6.0
October 1, 2024 21:16 13s
Bump eslint-plugin-vue from 9.26.0 to 9.28.0 Merge Conflict Check #670: Commit a9295f9 pushed by dependabot bot
October 1, 2024 21:15 13s dependabot/npm_and_yarn/eslint-plugin-vue-9.28.0
dependabot/npm_and_yarn/eslint-plugin-vue-9.28.0
October 1, 2024 21:15 13s
Bump vue from 3.4.27 to 3.5.4 Merge Conflict Check #669: Pull request #553 synchronize by dependabot bot
September 12, 2024 14:18 1m 10s
September 12, 2024 14:18 1m 10s
Bump vue from 3.4.27 to 3.5.4 Merge Conflict Check #668: Commit 25d2657 pushed by dependabot bot
September 12, 2024 14:18 1m 10s dependabot/npm_and_yarn/vue-3.5.4
dependabot/npm_and_yarn/vue-3.5.4
September 12, 2024 14:18 1m 10s
Bump eslint from 9.9.1 to 9.10.0 Merge Conflict Check #667: Pull request #554 synchronize by dependabot bot
September 12, 2024 14:18 39s
September 12, 2024 14:18 39s
Bump @eslint/js from 9.5.0 to 9.10.0 Merge Conflict Check #666: Pull request #552 synchronize by dependabot bot
September 12, 2024 14:18 10s
September 12, 2024 14:18 10s
Bump eslint from 9.9.1 to 9.10.0 Merge Conflict Check #665: Commit 257ce23 pushed by dependabot bot
September 12, 2024 14:18 15s dependabot/npm_and_yarn/eslint-9.10.0
dependabot/npm_and_yarn/eslint-9.10.0
September 12, 2024 14:18 15s
Bump @eslint/js from 9.5.0 to 9.10.0 Merge Conflict Check #664: Commit 82eff80 pushed by dependabot bot
September 12, 2024 14:18 12s dependabot/npm_and_yarn/eslint/js-9.10.0
dependabot/npm_and_yarn/eslint/js-9.10.0
September 12, 2024 14:18 12s
Bump globals from 15.6.0 to 15.9.0 Merge Conflict Check #663: Commit e0e8510 pushed by lkiesow
September 12, 2024 14:17 2m 47s main
main
September 12, 2024 14:17 2m 47s
Bump eslint from 9.9.1 to 9.10.0 Merge Conflict Check #662: Commit 0b0dc0e pushed by dependabot bot
September 12, 2024 14:17 12s dependabot/npm_and_yarn/eslint-9.10.0
dependabot/npm_and_yarn/eslint-9.10.0
September 12, 2024 14:17 12s
Bump vue from 3.4.27 to 3.5.4 Merge Conflict Check #661: Commit 4547811 pushed by dependabot bot
September 12, 2024 14:16 10s dependabot/npm_and_yarn/vue-3.5.4
dependabot/npm_and_yarn/vue-3.5.4
September 12, 2024 14:16 10s
Bump @eslint/js from 9.5.0 to 9.10.0 Merge Conflict Check #660: Commit 040fc1b pushed by dependabot bot
September 12, 2024 14:16 10s dependabot/npm_and_yarn/eslint/js-9.10.0
dependabot/npm_and_yarn/eslint/js-9.10.0
September 12, 2024 14:16 10s
Bump eslint from 9.5.0 to 9.9.1 Merge Conflict Check #659: Commit 5035342 pushed by lkiesow
September 12, 2024 14:16 2m 11s main
main
September 12, 2024 14:16 2m 11s
Bump @vue/compiler-sfc from 3.4.27 to 3.4.38 Merge Conflict Check #658: Commit 611bb86 pushed by lkiesow
September 12, 2024 14:16 2m 13s main
main
September 12, 2024 14:16 2m 13s
Bump @vue/compiler-sfc from 3.4.27 to 3.4.38 Merge Conflict Check #657: Commit 2c2587a pushed by dependabot bot
September 1, 2024 21:26 14s dependabot/npm_and_yarn/vue/compiler-sfc-3.4.38
dependabot/npm_and_yarn/vue/compiler-sfc-3.4.38
September 1, 2024 21:26 14s
Bump vue from 3.4.27 to 3.4.38 Merge Conflict Check #656: Commit 4e3835c pushed by dependabot bot
September 1, 2024 21:26 13s dependabot/npm_and_yarn/vue-3.4.38
dependabot/npm_and_yarn/vue-3.4.38
September 1, 2024 21:26 13s
Bump eslint from 9.5.0 to 9.9.1 Merge Conflict Check #655: Commit 9c96e9e pushed by dependabot bot
September 1, 2024 21:26 10s dependabot/npm_and_yarn/eslint-9.9.1
dependabot/npm_and_yarn/eslint-9.9.1
September 1, 2024 21:26 10s
Bump @eslint/js from 9.5.0 to 9.9.1 Merge Conflict Check #654: Commit c26e68d pushed by dependabot bot
September 1, 2024 21:25 11s dependabot/npm_and_yarn/eslint/js-9.9.1
dependabot/npm_and_yarn/eslint/js-9.9.1
September 1, 2024 21:25 11s