Skip to content

Actions: IMAWAL/FreeTube

Actions

Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
60 workflow runs
60 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

bump version Conflicts #60: Commit 5702575 pushed by IMAWAL
10s v0.23.14-1-beta
v0.23.14-1-beta
10s
bump version Conflicts #59: Commit 5702575 pushed by IMAWAL
9s master
master
9s
Merge branch 'master' of https://github.com/IMAWAL/FreeTube Conflicts #58: Commit c54d648 pushed by IMAWAL
9s master
master
9s
Merge remote-tracking branch 'upstream/master' Conflicts #57: Commit a8dfde3 pushed by IMAWAL
9s master
master
9s
Bump version to 0.23.13-1 in package.json Conflicts #56: Commit 1b85ba4 pushed by IMAWAL
6s v0.23.13-1-beta
v0.23.13-1-beta
6s
Bump version to 0.23.13-1 in package.json Conflicts #55: Commit 1b85ba4 pushed by IMAWAL
9s master
master
9s
Quick fix for #8729 Conflicts #54: Commit 34a6216 pushed by IMAWAL
7s v0.23.13-1-beta
v0.23.13-1-beta
7s
Quick fix for #8729 Conflicts #53: Commit 34a6216 pushed by IMAWAL
7s master
master
7s
Quick fix for #8729 Conflicts #52: Commit 7bb1376 pushed by IMAWAL
9s merge-ryanthomas-7bb1376
merge-ryanthomas-7bb1376
9s
Resolve merge conflict: use upstream version in package.json Conflicts #51: Commit 2158ee2 pushed by IMAWAL
6s v0.23.13-beta
v0.23.13-beta
6s
Resolve merge conflict: use upstream version in package.json Conflicts #50: Commit 2158ee2 pushed by IMAWAL
7s master
master
7s
Bump version to 0.23.12-3 in package.json Conflicts #49: Commit d3917e7 pushed by IMAWAL
11s v0.23.12-3-beta
v0.23.12-3-beta
11s
Bump version to 0.23.12-3 in package.json Conflicts #48: Commit d3917e7 pushed by IMAWAL
15s master
master
15s
Update youtubei.js dependency to version 16.0.1 Conflicts #47: Commit cf8dad0 pushed by IMAWAL
14s v0.23.12-2-beta
v0.23.12-2-beta
14s
Update youtubei.js dependency to version 16.0.1 Conflicts #46: Commit cf8dad0 pushed by IMAWAL
12s master
master
12s
Bump version to 0.23.12-1 and update youtubei.js dependency to ^16.0.1 Conflicts #45: Commit 4796e29 pushed by IMAWAL
11s v0.23.12-1-beta
v0.23.12-1-beta
11s
Bump version to 0.23.12-1 and update youtubei.js dependency to ^16.0.1 Conflicts #44: Commit 4796e29 pushed by IMAWAL
17s master
master
17s
Fix documentation links and update player buffering settings; remove … Conflicts #43: Commit 061d5e4 pushed by IMAWAL
15s master
master
15s
Merge remote-tracking branch 'upstream/master' Conflicts #42: Commit 3678547 pushed by IMAWAL
16s v0.23.12-beta
v0.23.12-beta
16s
Merge remote-tracking branch 'upstream/master' Conflicts #41: Commit 3678547 pushed by IMAWAL
14s master
master
14s
bump version to 0.23.9-5 Conflicts #40: Commit 1b65e80 pushed by IMAWAL
13s master
master
13s
Merge upstream/master into master (take upstream versions for conflic… Conflicts #39: Commit 4a1079c pushed by IMAWAL
12s master
master
12s
bump version to 0.23.9-5 Conflicts #38: Commit 1b65e80 pushed by IMAWAL
9s v0.23.9-5-beta
v0.23.9-5-beta
9s
bump version to 0.23.9-5 Conflicts #37: Commit 1b65e80 pushed by IMAWAL
7s master
master
7s
Update README to clarify fork differences and increase buffering and … Conflicts #36: Commit a41ee7d pushed by IMAWAL
7s master
master
7s