Skip to content

Actions: FreeTubeApp/FreeTube

Actions

Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
192 workflow run results
192 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Bump @fortawesome/free-brands-svg-icons from 6.4.0 to 6.4.2 Conflicts #4033: Pull request #3857 synchronize by dependabot bot
August 7, 2023 18:16 10m 19s
August 7, 2023 18:16 10m 19s
Bump @fortawesome/free-brands-svg-icons from 6.4.0 to 6.4.2 Conflicts #4032: Commit 0fd610d pushed by dependabot bot
August 7, 2023 18:16 10m 12s dependabot/npm_and_yarn/fortawesome/free-brands-svg-icons-6.4.2
dependabot/npm_and_yarn/fortawesome/free-brands-svg-icons-6.4.2
August 7, 2023 18:16 10m 12s
Bump @fortawesome/free-brands-svg-icons from 6.4.0 to 6.4.2 Conflicts #4031: Pull request #3857 synchronize by dependabot bot
August 7, 2023 18:15 10m 46s
August 7, 2023 18:15 10m 46s
Bump @fortawesome/free-brands-svg-icons from 6.4.0 to 6.4.2 Conflicts #4030: Commit c160126 pushed by dependabot bot
August 7, 2023 18:15 10m 25s dependabot/npm_and_yarn/fortawesome/free-brands-svg-icons-6.4.2
dependabot/npm_and_yarn/fortawesome/free-brands-svg-icons-6.4.2
August 7, 2023 18:15 10m 25s
Bump @fortawesome/free-solid-svg-icons from 6.4.0 to 6.4.2 Conflicts #4029: Pull request #3856 synchronize by dependabot bot
August 7, 2023 18:14 11m 2s
August 7, 2023 18:14 11m 2s
Bump @fortawesome/free-solid-svg-icons from 6.4.0 to 6.4.2 Conflicts #4028: Commit 6376d61 pushed by dependabot bot
August 7, 2023 18:14 10m 27s dependabot/npm_and_yarn/fortawesome/free-solid-svg-icons-6.4.2
dependabot/npm_and_yarn/fortawesome/free-solid-svg-icons-6.4.2
August 7, 2023 18:14 10m 27s
Bump lefthook from 1.4.7 to 1.4.8 (#3855) Conflicts #4027: Commit 25a71f7 pushed by FreeTubeBot
August 7, 2023 18:12 9m 42s development
development
August 7, 2023 18:12 9m 42s
Bump eslint-config-prettier from 8.9.0 to 9.0.0 (#3858) Conflicts #4026: Commit ffba765 pushed by FreeTubeBot
August 7, 2023 18:12 3m 38s development
development
August 7, 2023 18:12 3m 38s
Bump marked from 4.3.0 to 7.0.0 (#3859) Conflicts #4025: Commit 9858d08 pushed by FreeTubeBot
August 7, 2023 18:12 2m 15s development
development
August 7, 2023 18:12 2m 15s
Bump @fortawesome/fontawesome-svg-core from 6.4.0 to 6.4.2 (#3860) Conflicts #4024: Commit 3d5d732 pushed by FreeTubeBot
August 7, 2023 18:11 2m 17s development
development
August 7, 2023 18:11 2m 17s
Bump sass from 1.64.1 to 1.64.2 (#3861) Conflicts #4023: Commit 0a49a91 pushed by FreeTubeBot
August 7, 2023 18:11 4m 19s development
development
August 7, 2023 18:11 4m 19s
Bump sass from 1.64.1 to 1.64.2 Conflicts #4022: Commit 91ca086 pushed by dependabot bot
August 7, 2023 08:38 9s dependabot/npm_and_yarn/sass-1.64.2
dependabot/npm_and_yarn/sass-1.64.2
August 7, 2023 08:38 9s
Bump @fortawesome/fontawesome-svg-core from 6.4.0 to 6.4.2 Conflicts #4021: Commit 0bd4871 pushed by dependabot bot
August 7, 2023 08:37 10s dependabot/npm_and_yarn/fortawesome/fontawesome-svg-core-6.4.2
dependabot/npm_and_yarn/fortawesome/fontawesome-svg-core-6.4.2
August 7, 2023 08:37 10s
Bump marked from 4.3.0 to 7.0.0 Conflicts #4020: Commit 795ff20 pushed by dependabot bot
August 7, 2023 08:37 11s dependabot/npm_and_yarn/marked-7.0.0
dependabot/npm_and_yarn/marked-7.0.0
August 7, 2023 08:37 11s
Bump eslint-config-prettier from 8.9.0 to 9.0.0 Conflicts #4019: Commit 8290f6b pushed by dependabot bot
August 7, 2023 08:37 13s dependabot/npm_and_yarn/eslint-config-prettier-9.0.0
dependabot/npm_and_yarn/eslint-config-prettier-9.0.0
August 7, 2023 08:37 13s
Bump @fortawesome/free-brands-svg-icons from 6.4.0 to 6.4.2 Conflicts #4018: Commit b08c651 pushed by dependabot bot
August 7, 2023 08:36 12s dependabot/npm_and_yarn/fortawesome/free-brands-svg-icons-6.4.2
dependabot/npm_and_yarn/fortawesome/free-brands-svg-icons-6.4.2
August 7, 2023 08:36 12s
Bump @fortawesome/free-solid-svg-icons from 6.4.0 to 6.4.2 Conflicts #4017: Commit c06abc0 pushed by dependabot bot
August 7, 2023 08:36 10s dependabot/npm_and_yarn/fortawesome/free-solid-svg-icons-6.4.2
dependabot/npm_and_yarn/fortawesome/free-solid-svg-icons-6.4.2
August 7, 2023 08:36 10s
Bump lefthook from 1.4.7 to 1.4.8 Conflicts #4016: Commit f5eb43f pushed by dependabot bot
August 7, 2023 08:35 10s dependabot/npm_and_yarn/lefthook-1.4.8
dependabot/npm_and_yarn/lefthook-1.4.8
August 7, 2023 08:35 10s
Translated using Weblate (Italian) Conflicts #4015: Commit b723642 pushed by weblate
August 7, 2023 01:56 2m 14s development
development
August 7, 2023 01:56 2m 14s
Translated using Weblate (Portuguese (Brazil)) Conflicts #4014: Commit ae58e71 pushed by weblate
August 6, 2023 18:50 2m 12s development
development
August 6, 2023 18:50 2m 12s
Fix focus not showing on channel page tabs and in prompts (#3850) Conflicts #4013: Commit 4e4fe69 pushed by FreeTubeBot
August 6, 2023 17:26 2m 14s development
development
August 6, 2023 17:26 2m 14s
Fix auto merge workflow breaking with draft pull requests (#3852) Conflicts #4012: Commit 479ce63 pushed by FreeTubeBot
August 6, 2023 17:23 2m 14s development
development
August 6, 2023 17:23 2m 14s
Parse IV search urls (#3849) Conflicts #4011: Commit 5fffe83 pushed by FreeTubeBot
August 6, 2023 12:21 2m 13s development
development
August 6, 2023 12:21 2m 13s
Parse IV search urls Conflicts #4010: Pull request #3849 synchronize by ChunkyProgrammer
August 5, 2023 12:30 13s
August 5, 2023 12:30 13s
Fix auto merge workflow breaking with draft pull requests Conflicts #4009: Pull request #3852 synchronize by absidue
August 5, 2023 11:13 10s
August 5, 2023 11:13 10s