Skip to content

Actions: FreeTubeApp/FreeTube

Actions

Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
3,679 workflow runs
3,679 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Bump shaka-player from 4.16.14 to 4.16.15 (#8603) Conflicts #12197: Commit 49c5e37 pushed by FreeTubeBot
2m 10s development
development
2m 10s
Fix player full screen causing the app to start in full screen Conflicts #12196: Pull request #5138 synchronize by absidue
11s
11s
Bump eslint-plugin-jsdoc from 62.3.1 to 62.5.0 in the eslint group (#… Conflicts #12195: Commit 8b1739f pushed by FreeTubeBot
2m 9s development
development
2m 9s
Bump css-loader from 7.1.2 to 7.1.3 (#8600) Conflicts #12194: Commit 00d5921 pushed by FreeTubeBot
2m 10s development
development
2m 10s
Bump eslint-plugin-jsdoc from 62.3.1 to 62.5.0 in the eslint group Conflicts #12193: Pull request #8597 synchronize by dependabot bot
8s
8s
Bump eslint-plugin-jsdoc from 62.3.1 to 62.5.0 in the eslint group Conflicts #12192: Commit 22edae0 pushed by dependabot bot
8s dependabot/npm_and_yarn/eslint-bb7144d725
dependabot/npm_and_yarn/eslint-bb7144d725
8s
Bump css-loader from 7.1.2 to 7.1.3 Conflicts #12191: Pull request #8600 synchronize by dependabot bot
11s
11s
Bump css-loader from 7.1.2 to 7.1.3 Conflicts #12190: Commit 4e85ba7 pushed by dependabot bot
9s dependabot/npm_and_yarn/css-loader-7.1.3
dependabot/npm_and_yarn/css-loader-7.1.3
9s
Bump electron from 40.0.0 to 40.1.0 (#8605) Conflicts #12189: Commit 9a18a5a pushed by FreeTubeBot
2m 11s development
development
2m 11s
Bump shaka-player from 4.16.14 to 4.16.15 Conflicts #12188: Pull request #8603 synchronize by dependabot bot
12s
12s
Bump shaka-player from 4.16.14 to 4.16.15 Conflicts #12187: Commit 115854e pushed by dependabot bot
10s dependabot/npm_and_yarn/shaka-player-4.16.15
dependabot/npm_and_yarn/shaka-player-4.16.15
10s
Bump globals from 17.1.0 to 17.2.0 (#8604) Conflicts #12186: Commit d40f020 pushed by FreeTubeBot
5m 12s development
development
5m 12s
Bump shaka-player from 4.16.14 to 4.16.15 Conflicts #12185: Pull request #8603 synchronize by dependabot bot
4m 53s
4m 53s
Bump shaka-player from 4.16.14 to 4.16.15 Conflicts #12184: Commit d19e054 pushed by dependabot bot
13s dependabot/npm_and_yarn/shaka-player-4.16.15
dependabot/npm_and_yarn/shaka-player-4.16.15
13s
Bump stylelint-high-performance-animation in the stylelint group (#8598) Conflicts #12183: Commit de80a58 pushed by FreeTubeBot
3m 48s development
development
3m 48s
Bump github/codeql-action from 4.31.10 to 4.32.0 (#8596) Conflicts #12182: Commit 17492e0 pushed by FreeTubeBot
2m 16s development
development
2m 16s
Bump lefthook from 2.0.15 to 2.0.16 (#8601) Conflicts #12181: Commit f5a1edd pushed by FreeTubeBot
20m 5s development
development
20m 5s
Bump swiper from 12.0.3 to 12.1.0 (#8602) Conflicts #12180: Commit 984519b pushed by FreeTubeBot
4m 10s development
development
4m 10s
Bump electron from 40.0.0 to 40.1.0 Conflicts #12179: Commit d5f8a1c pushed by dependabot bot
9s dependabot/npm_and_yarn/electron-40.1.0
dependabot/npm_and_yarn/electron-40.1.0
9s
Bump globals from 17.1.0 to 17.2.0 Conflicts #12178: Commit 1bb4ed3 pushed by dependabot bot
8s dependabot/npm_and_yarn/globals-17.2.0
dependabot/npm_and_yarn/globals-17.2.0
8s
Bump shaka-player from 4.16.14 to 4.16.15 Conflicts #12177: Commit 856a23d pushed by dependabot bot
9s dependabot/npm_and_yarn/shaka-player-4.16.15
dependabot/npm_and_yarn/shaka-player-4.16.15
9s
Bump swiper from 12.0.3 to 12.1.0 Conflicts #12176: Commit 8d00b5d pushed by dependabot bot
9s dependabot/npm_and_yarn/swiper-12.1.0
dependabot/npm_and_yarn/swiper-12.1.0
9s
Bump lefthook from 2.0.15 to 2.0.16 Conflicts #12175: Commit df1958f pushed by dependabot bot
10s dependabot/npm_and_yarn/lefthook-2.0.16
dependabot/npm_and_yarn/lefthook-2.0.16
10s
Bump css-loader from 7.1.2 to 7.1.3 Conflicts #12174: Commit d14f186 pushed by dependabot bot
8s dependabot/npm_and_yarn/css-loader-7.1.3
dependabot/npm_and_yarn/css-loader-7.1.3
8s
Bump vue-router from 4.6.4 to 5.0.0 Conflicts #12173: Commit 41e3def pushed by dependabot bot
8s dependabot/npm_and_yarn/vue-router-5.0.0
dependabot/npm_and_yarn/vue-router-5.0.0
8s