Skip to content

Actions: PikachuEXE/FreeTube

Actions

Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
405 workflow runs
405 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge branch 'development' into custom-builds/tmp Conflicts #738: Commit 5ee3bf6 pushed by PikachuEXE
December 10, 2024 01:27 11s custom-builds/current
custom-builds/current
December 10, 2024 01:27 11s
Merge branch 'fix/user-playlist-button-visible' into custom-builds/tmp Conflicts #737: Commit e013a43 pushed by PikachuEXE
December 4, 2024 01:38 14s custom-builds/current
custom-builds/current
December 4, 2024 01:38 14s
! Fix export playlist button visible in edit mode Conflicts #736: Commit 68efc65 pushed by PikachuEXE
December 4, 2024 01:27 13s fix/user-playlist-button-visible
fix/user-playlist-button-visible
December 4, 2024 01:27 13s
* Put event listener back to mounted Conflicts #735: Commit ad83ebf pushed by PikachuEXE
November 29, 2024 12:45 14s feature/history/remember-search-query
feature/history/remember-search-query
November 29, 2024 12:45 14s
$ Change code style Conflicts #734: Commit 82c92d3 pushed by PikachuEXE
November 28, 2024 00:28 14s feature/history/remember-search-query
feature/history/remember-search-query
November 28, 2024 00:28 14s
* Update build workflow to add back osx-arm64 Conflicts #733: Commit 81027b2 pushed by PikachuEXE
November 25, 2024 08:07 14s build/add-mac-arm64
build/add-mac-arm64
November 25, 2024 08:07 14s
* Update build workflow to add back osx-arm64 Conflicts #732: Commit fe7ca72 pushed by PikachuEXE
November 25, 2024 07:50 11s build/add-mac-arm64
build/add-mac-arm64
November 25, 2024 07:50 11s
* Update build workflow to add back osx-arm64 Conflicts #731: Commit ed8846d pushed by PikachuEXE
November 25, 2024 07:49 11s build/add-mac-arm64
build/add-mac-arm64
November 25, 2024 07:49 11s
- Remove useless file after merging dev Conflicts #730: Commit 6041e3a pushed by PikachuEXE
November 24, 2024 01:02 9s feature/history/remember-search-query
feature/history/remember-search-query
November 24, 2024 01:02 9s
Merge branch 'development' into feature/history/remember-search-query Conflicts #729: Commit a5f5a66 pushed by PikachuEXE
November 24, 2024 01:01 13s feature/history/remember-search-query
feature/history/remember-search-query
November 24, 2024 01:01 13s
* Update build workflow to add back osx-arm64 Conflicts #728: Commit 4e2639d pushed by PikachuEXE
November 13, 2024 01:08 14s build/add-mac-arm64
build/add-mac-arm64
November 13, 2024 01:08 14s
Merge branch 'fix/storyboard' into custom-builds/current Conflicts #727: Commit 6fb3e4b pushed by PikachuEXE
November 4, 2024 19:23 11s custom-builds/current
custom-builds/current
November 4, 2024 19:23 11s
! Revert unintended change Conflicts #726: Commit 55784ca pushed by PikachuEXE
November 4, 2024 19:23 12s fix/storyboard
fix/storyboard
November 4, 2024 19:23 12s
* Update some playlist attribuites too during import for existing pla… Conflicts #725: Commit 373efdf pushed by PikachuEXE
November 4, 2024 08:30 12s feature/playlist-merge-find-by-id-first
feature/playlist-merge-find-by-id-first
November 4, 2024 08:30 12s
Merge branch 'fix-nightly-builds' into custom-builds/current Conflicts #724: Commit c754afd pushed by PikachuEXE
November 4, 2024 02:48 13s custom-builds/current
custom-builds/current
November 4, 2024 02:48 13s
Merge branch 'search-box-crash' into custom-builds/tmp Conflicts #723: Commit 773f46b pushed by PikachuEXE
November 4, 2024 02:22 10s custom-builds/current
custom-builds/current
November 4, 2024 02:22 10s
Update src/renderer/components/ft-shaka-video-player/ft-shaka-video-p… Conflicts #722: Commit 738925e pushed by PikachuEXE
November 1, 2024 02:24 11s fix/macos-settings-shortcut
fix/macos-settings-shortcut
November 1, 2024 02:24 11s
! Fix shortcut for macOS setting shortcut in video page Conflicts #721: Commit 56e54f9 pushed by PikachuEXE
November 1, 2024 00:50 15s fix/macos-settings-shortcut
fix/macos-settings-shortcut
November 1, 2024 00:50 15s
^ Update electron 32.x Conflicts #720: Commit d02db71 pushed by PikachuEXE
October 26, 2024 02:09 18s update/electron-32.x
update/electron-32.x
October 26, 2024 02:09 18s
Merge branch 'feat/add-shortcut-labels' into custom-builds/tmp Conflicts #719: Commit 989cf15 pushed by PikachuEXE
October 23, 2024 01:03 17s custom-builds/current
custom-builds/current
October 23, 2024 01:03 17s
Merge branch 'development' into custom-builds/tmp Conflicts #718: Commit ab96588 pushed by PikachuEXE
October 16, 2024 19:29 12s custom-builds/current
custom-builds/current
October 16, 2024 19:29 12s
! Fix no comment detection Conflicts #717: Commit d58978a pushed by PikachuEXE
October 16, 2024 19:26 12s fix/no-comment-RC
fix/no-comment-RC
October 16, 2024 19:26 12s
! Fix no comment detection Conflicts #716: Commit f11c2ad pushed by PikachuEXE
October 16, 2024 12:57 13s fix/no-comment
fix/no-comment
October 16, 2024 12:57 13s
force comment Conflicts #715: Commit c724f73 pushed by PikachuEXE
October 16, 2024 12:40 12s custom-builds/current
custom-builds/current
October 16, 2024 12:40 12s
! Fix search tab showing "0 results" before search done Conflicts #714: Commit 03f887e pushed by PikachuEXE
October 16, 2024 01:45 11s feature/history/remember-search-query
feature/history/remember-search-query
October 16, 2024 01:45 11s