Skip to content

Actions: FreeTubeApp/FreeTube

Actions

Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
4,407 workflow runs
4,407 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Bump webpack from 5.95.0 to 5.96.1 Conflicts #8220: Commit ccbceae pushed by dependabot bot
November 2, 2024 11:44 9s dependabot/npm_and_yarn/webpack-5.96.1
dependabot/npm_and_yarn/webpack-5.96.1
November 2, 2024 11:44 9s
Bump mini-css-extract-plugin from 2.9.1 to 2.9.2 Conflicts #8219: Pull request #6068 synchronize by dependabot bot
November 2, 2024 11:44 9s
November 2, 2024 11:44 9s
Bump mini-css-extract-plugin from 2.9.1 to 2.9.2 Conflicts #8218: Commit eb40042 pushed by dependabot bot
November 2, 2024 11:44 11s dependabot/npm_and_yarn/mini-css-extract-plugin-2.9.2
dependabot/npm_and_yarn/mini-css-extract-plugin-2.9.2
November 2, 2024 11:44 11s
Bump sass from 1.80.4 to 1.80.6 Conflicts #8217: Pull request #6071 synchronize by dependabot bot
November 2, 2024 11:44 13s
November 2, 2024 11:44 13s
Bump sass from 1.80.4 to 1.80.6 Conflicts #8216: Commit 6f2434a pushed by dependabot bot
November 2, 2024 11:44 12s dependabot/npm_and_yarn/sass-1.80.6
dependabot/npm_and_yarn/sass-1.80.6
November 2, 2024 11:44 12s
Bump webpack from 5.95.0 to 5.96.1 Conflicts #8215: Pull request #6069 synchronize by dependabot bot
November 2, 2024 11:44 9s
November 2, 2024 11:44 9s
Bump webpack from 5.95.0 to 5.96.1 Conflicts #8214: Commit 916e5d3 pushed by dependabot bot
November 2, 2024 11:44 15s dependabot/npm_and_yarn/webpack-5.96.1
dependabot/npm_and_yarn/webpack-5.96.1
November 2, 2024 11:44 15s
Bump mini-css-extract-plugin from 2.9.1 to 2.9.2 Conflicts #8213: Pull request #6068 synchronize by dependabot bot
November 2, 2024 11:43 11s
November 2, 2024 11:43 11s
Bump mini-css-extract-plugin from 2.9.1 to 2.9.2 Conflicts #8212: Commit 1de6a10 pushed by dependabot bot
November 2, 2024 11:43 9s dependabot/npm_and_yarn/mini-css-extract-plugin-2.9.2
dependabot/npm_and_yarn/mini-css-extract-plugin-2.9.2
November 2, 2024 11:43 9s
Bump sass-loader from 16.0.2 to 16.0.3 (#6070) Conflicts #8211: Commit 1b6a16a pushed by FreeTubeBot
November 2, 2024 11:43 2m 13s development
development
November 2, 2024 11:43 2m 13s
Bump lefthook from 1.8.1 to 1.8.2 (#6067) Conflicts #8210: Commit d6b8863 pushed by FreeTubeBot
November 2, 2024 11:42 2m 10s development
development
November 2, 2024 11:42 2m 10s
Bump webpack from 5.95.0 to 5.96.1 Conflicts #8209: Pull request #6069 synchronize by dependabot bot
November 2, 2024 11:39 9s
November 2, 2024 11:39 9s
Bump webpack from 5.95.0 to 5.96.1 Conflicts #8208: Commit 741e332 pushed by dependabot bot
November 2, 2024 11:39 10s dependabot/npm_and_yarn/webpack-5.96.1
dependabot/npm_and_yarn/webpack-5.96.1
November 2, 2024 11:39 10s
Bump the eslint group with 2 updates (#6066) Conflicts #8207: Commit bc6b207 pushed by FreeTubeBot
November 2, 2024 11:38 2m 11s development
development
November 2, 2024 11:38 2m 11s
Bump youtubei.js from 11.0.0 to 11.0.1 (#6072) Conflicts #8206: Commit 2033f35 pushed by FreeTubeBot
November 2, 2024 11:34 2m 14s development
development
November 2, 2024 11:34 2m 14s
Migrate PasswordSettings and PasswordDialog to the composition API (#… Conflicts #8205: Commit 08e5e3e pushed by FreeTubeBot
November 2, 2024 10:53 2m 13s development
development
November 2, 2024 10:53 2m 13s
Bump youtubei.js from 11.0.0 to 11.0.1 Conflicts #8204: Commit 0d45e2a pushed by dependabot bot
November 2, 2024 10:41 12s dependabot/npm_and_yarn/youtubei.js-11.0.1
dependabot/npm_and_yarn/youtubei.js-11.0.1
November 2, 2024 10:41 12s
Bump sass from 1.80.4 to 1.80.6 Conflicts #8203: Commit e4174d5 pushed by dependabot bot
November 2, 2024 10:41 13s dependabot/npm_and_yarn/sass-1.80.6
dependabot/npm_and_yarn/sass-1.80.6
November 2, 2024 10:41 13s
Bump sass-loader from 16.0.2 to 16.0.3 Conflicts #8202: Commit 6ab5aa5 pushed by dependabot bot
November 2, 2024 10:40 13s dependabot/npm_and_yarn/sass-loader-16.0.3
dependabot/npm_and_yarn/sass-loader-16.0.3
November 2, 2024 10:40 13s
Bump webpack from 5.95.0 to 5.96.1 Conflicts #8201: Commit 094c92c pushed by dependabot bot
November 2, 2024 10:40 13s dependabot/npm_and_yarn/webpack-5.96.1
dependabot/npm_and_yarn/webpack-5.96.1
November 2, 2024 10:40 13s
Bump mini-css-extract-plugin from 2.9.1 to 2.9.2 Conflicts #8200: Commit 5d45a37 pushed by dependabot bot
November 2, 2024 10:40 14s dependabot/npm_and_yarn/mini-css-extract-plugin-2.9.2
dependabot/npm_and_yarn/mini-css-extract-plugin-2.9.2
November 2, 2024 10:40 14s
Bump lefthook from 1.8.1 to 1.8.2 Conflicts #8199: Commit ae106b3 pushed by dependabot bot
November 2, 2024 10:40 9s dependabot/npm_and_yarn/lefthook-1.8.2
dependabot/npm_and_yarn/lefthook-1.8.2
November 2, 2024 10:40 9s
Bump the eslint group with 2 updates Conflicts #8198: Commit 8ccee46 pushed by dependabot bot
November 2, 2024 10:39 10s dependabot/npm_and_yarn/eslint-98b64a344f
dependabot/npm_and_yarn/eslint-98b64a344f
November 2, 2024 10:39 10s
Add some missing jsdoc comments, add jsdoc eslint plugin (#6048) Conflicts #8197: Commit a28bb3f pushed by FreeTubeBot
November 2, 2024 10:38 2m 17s development
development
November 2, 2024 10:38 2m 17s
Fix shortcut for macOS setting shortcut in video page (#6054) Conflicts #8196: Commit a2df91f pushed by FreeTubeBot
November 2, 2024 10:35 2m 12s development
development
November 2, 2024 10:35 2m 12s