Skip to content

Actions: FreeTubeApp/FreeTubeApp.io

Actions

Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
66 workflow runs
66 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Bump appleboy/ssh-action from 1.2.4 to 1.2.5 Conflicts #166: Commit 7993ce9 pushed by dependabot bot
7s dependabot/github_actions/appleboy/ssh-action-1.2.5
dependabot/github_actions/appleboy/ssh-action-1.2.5
7s
Update version number to v0.23.13 Conflicts #165: Commit 39dec16 pushed by PrestonN
2m 7s master
master
2m 7s
Update copyright year in footer (#90) Conflicts #164: Commit e7a8776 pushed by FreeTubeBot
2m 6s master
master
2m 6s
Update copyright year in footer Conflicts #163: Commit 7af72b5 pushed by efb4f5ff-1298-471a-8973-3d47447115dc
10s update-copyright
update-copyright
10s
Bump peter-evans/create-pull-request from 7 to 8 (#89) Conflicts #162: Commit 7e216f6 pushed by FreeTubeBot
2m 11s master
master
2m 11s
Bump peter-evans/create-pull-request from 7 to 8 Conflicts #161: Commit 25fedf6 pushed by dependabot bot
7s dependabot/github_actions/peter-evans/create-pull-request-8
dependabot/github_actions/peter-evans/create-pull-request-8
7s
Bump appleboy/ssh-action from 1.2.3 to 1.2.4 (#88) Conflicts #160: Commit 0fc3109 pushed by FreeTubeBot
2m 9s master
master
2m 9s
Bump appleboy/ssh-action from 1.2.3 to 1.2.4 Conflicts #159: Commit 574de19 pushed by dependabot bot
6s dependabot/github_actions/appleboy/ssh-action-1.2.4
dependabot/github_actions/appleboy/ssh-action-1.2.4
6s
Bump actions/checkout from 5 to 6 (#87) Conflicts #158: Commit 3d6fa3b pushed by FreeTubeBot
2m 8s master
master
2m 8s
Bump actions/checkout from 5 to 6 Conflicts #157: Commit b608729 pushed by dependabot bot
8s dependabot/github_actions/actions/checkout-6
dependabot/github_actions/actions/checkout-6
8s
Bump appleboy/ssh-action from 1.2.2 to 1.2.3 (#86) Conflicts #156: Commit 4f7526a pushed by FreeTubeBot
2m 11s master
master
2m 11s
Bump appleboy/ssh-action from 1.2.2 to 1.2.3 Conflicts #155: Commit b04e90b pushed by dependabot bot
7s dependabot/github_actions/appleboy/ssh-action-1.2.3
dependabot/github_actions/appleboy/ssh-action-1.2.3
7s
Fix header layout on small screens (#85) Conflicts #154: Commit 9b4ad9b pushed by FreeTubeBot
2m 9s master
master
2m 9s
Fix header layout on small screens Conflicts #153: Pull request #85 synchronize by zobla-kv
6s
6s
Update version number to v0.23.12 Conflicts #152: Commit f11bff5 pushed by PrestonN
2m 7s master
master
2m 7s
Update version number to v0.23.11 Conflicts #151: Commit 248cff2 pushed by PrestonN
2m 7s master
master
2m 7s
Update version number to v0.23.10 Conflicts #150: Commit e08dc23 pushed by PrestonN
2m 9s master
master
2m 9s
Compressed Images (#82) Conflicts #149: Commit 30df794 pushed by FreeTubeBot
2m 7s master
master
2m 7s
Compressed Images (#80) Conflicts #148: Commit dfb2e52 pushed by FreeTubeBot
2m 8s master
master
2m 8s
Delete index.phpn (#81) Conflicts #147: Commit d0b9ee0 pushed by FreeTubeBot
2m 12s master
master
2m 12s
Update version number to v0.23.9 Conflicts #146: Commit fc84291 pushed by PrestonN
2m 9s master
master
2m 9s
Bump actions/labeler from 5 to 6 (#78) Conflicts #145: Commit 279fcfc pushed by FreeTubeBot
8s master
master
8s
Compressed Images (#76) Conflicts #144: Commit deef598 pushed by FreeTubeBot
2m 8s master
master
2m 8s
Bump actions/labeler from 5 to 6 Conflicts #143: Commit 85fb720 pushed by dependabot bot
9s dependabot/github_actions/actions/labeler-6
dependabot/github_actions/actions/labeler-6
9s
Bump actions/checkout from 4 to 5 (#74) Conflicts #142: Commit 4a53d35 pushed by FreeTubeBot
10s master
master
10s