Skip to content

Actions: FreeTubeApp/FreeTube

Actions

Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Bump electron-builder from 24.13.3 to 25.0.5 Conflicts #7576: Commit 3359822 pushed by dependabot bot
September 9, 2024 11:09 5m 35s dependabot/npm_and_yarn/electron-builder-25.0.5
dependabot/npm_and_yarn/electron-builder-25.0.5
September 9, 2024 11:09 5m 35s
Bump electron-builder from 24.13.3 to 25.0.5 Conflicts #7575: Pull request #5674 synchronize by dependabot bot
September 9, 2024 11:08 6m 26s
September 9, 2024 11:08 6m 26s
Bump electron-builder from 24.13.3 to 25.0.5 Conflicts #7574: Commit dab3143 pushed by dependabot bot
September 9, 2024 11:08 5m 50s dependabot/npm_and_yarn/electron-builder-25.0.5
dependabot/npm_and_yarn/electron-builder-25.0.5
September 9, 2024 11:08 5m 50s
Bump sass from 1.77.8 to 1.78.0 (#5673) Conflicts #7573: Commit c53b117 pushed by FreeTubeBot
September 9, 2024 11:07 6m 25s development
development
September 9, 2024 11:07 6m 25s
Bump electron-builder from 24.13.3 to 25.0.5 Conflicts #7572: Pull request #5674 synchronize by dependabot bot
September 9, 2024 11:07 6m 46s
September 9, 2024 11:07 6m 46s
Bump electron-builder from 24.13.3 to 25.0.5 Conflicts #7571: Commit 789aa61 pushed by dependabot bot
September 9, 2024 11:07 6m 37s dependabot/npm_and_yarn/electron-builder-25.0.5
dependabot/npm_and_yarn/electron-builder-25.0.5
September 9, 2024 11:07 6m 37s
Bump webpack-dev-server from 5.0.4 to 5.1.0 Conflicts #7570: Pull request #5672 synchronize by dependabot bot
September 9, 2024 11:07 6m 13s
September 9, 2024 11:07 6m 13s
Bump webpack-dev-server from 5.0.4 to 5.1.0 Conflicts #7569: Commit 5f2a623 pushed by dependabot bot
September 9, 2024 11:07 5m 53s dependabot/npm_and_yarn/webpack-dev-server-5.1.0
dependabot/npm_and_yarn/webpack-dev-server-5.1.0
September 9, 2024 11:07 5m 53s
Bump electron from 32.0.1 to 32.0.2 (#5671) Conflicts #7568: Commit 766582e pushed by FreeTubeBot
September 9, 2024 11:07 3m 25s development
development
September 9, 2024 11:07 3m 25s
Bump marked from 14.1.0 to 14.1.2 (#5670) Conflicts #7567: Commit f7df30c pushed by FreeTubeBot
September 9, 2024 11:06 2m 16s development
development
September 9, 2024 11:06 2m 16s
Bump postcss from 8.4.44 to 8.4.45 in the stylelint group (#5669) Conflicts #7566: Commit 45557d0 pushed by FreeTubeBot
September 9, 2024 11:06 16s development
development
September 9, 2024 11:06 16s
Bump the eslint group with 2 updates (#5668) Conflicts #7565: Commit c542a0d pushed by FreeTubeBot
September 9, 2024 11:06 4m 24s development
development
September 9, 2024 11:06 4m 24s
Bump shaka-player from 4.10.12 to 4.11.1 Conflicts #7564: Commit dc4c5a5 pushed by dependabot bot
September 9, 2024 10:55 15s dependabot/npm_and_yarn/shaka-player-4.11.1
dependabot/npm_and_yarn/shaka-player-4.11.1
September 9, 2024 10:55 15s
Cleanup a few vue-i18n usages (#5663) Conflicts #7563: Commit d9b4d13 pushed by FreeTubeBot
September 9, 2024 09:32 2m 13s development
development
September 9, 2024 09:32 2m 13s
Use nextTick instead of setTimeout to wait until Vue has rendered cha… Conflicts #7562: Commit afa4fc0 pushed by FreeTubeBot
September 9, 2024 09:18 2m 14s development
development
September 9, 2024 09:18 2m 14s
Bump peter-evans/create-pull-request from 6 to 7 Conflicts #7561: Commit 99f860f pushed by dependabot bot
September 9, 2024 08:51 12s dependabot/github_actions/peter-evans/create-pull-request-7
dependabot/github_actions/peter-evans/create-pull-request-7
September 9, 2024 08:51 12s
Bump shaka-player from 4.10.12 to 4.11.0 Conflicts #7560: Commit 966ed0d pushed by dependabot bot
September 9, 2024 08:10 16s dependabot/npm_and_yarn/shaka-player-4.11.0
dependabot/npm_and_yarn/shaka-player-4.11.0
September 9, 2024 08:10 16s
Bump electron-builder from 24.13.3 to 25.0.5 Conflicts #7559: Commit 4f74bfc pushed by dependabot bot
September 9, 2024 08:09 10s dependabot/npm_and_yarn/electron-builder-25.0.5
dependabot/npm_and_yarn/electron-builder-25.0.5
September 9, 2024 08:09 10s
Bump sass from 1.77.8 to 1.78.0 Conflicts #7558: Commit a25224f pushed by dependabot bot
September 9, 2024 08:07 14s dependabot/npm_and_yarn/sass-1.78.0
dependabot/npm_and_yarn/sass-1.78.0
September 9, 2024 08:07 14s
Bump webpack-dev-server from 5.0.4 to 5.1.0 Conflicts #7557: Commit fae0abb pushed by dependabot bot
September 9, 2024 08:06 10s dependabot/npm_and_yarn/webpack-dev-server-5.1.0
dependabot/npm_and_yarn/webpack-dev-server-5.1.0
September 9, 2024 08:06 10s
Bump electron from 32.0.1 to 32.0.2 Conflicts #7556: Commit b7ed96a pushed by dependabot bot
September 9, 2024 08:06 11s dependabot/npm_and_yarn/electron-32.0.2
dependabot/npm_and_yarn/electron-32.0.2
September 9, 2024 08:06 11s
Bump marked from 14.1.0 to 14.1.2 Conflicts #7555: Commit dde1586 pushed by dependabot bot
September 9, 2024 08:05 47s dependabot/npm_and_yarn/marked-14.1.2
dependabot/npm_and_yarn/marked-14.1.2
September 9, 2024 08:05 47s
Bump postcss from 8.4.44 to 8.4.45 in the stylelint group Conflicts #7554: Commit 9578e5a pushed by dependabot bot
September 9, 2024 08:05 12s dependabot/npm_and_yarn/stylelint-7ee3b15cf5
dependabot/npm_and_yarn/stylelint-7ee3b15cf5
September 9, 2024 08:05 12s
Bump the eslint group with 2 updates Conflicts #7553: Commit d503d7e pushed by dependabot bot
September 9, 2024 08:04 11s dependabot/npm_and_yarn/eslint-776acc2c96
dependabot/npm_and_yarn/eslint-776acc2c96
September 9, 2024 08:04 11s
Implement persistent subscription cache Conflicts #7552: Pull request #5185 synchronize by PikachuEXE
September 9, 2024 01:41 12s
September 9, 2024 01:41 12s