Skip to content

Actions: pi-hole/docker-pi-hole

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflict.yml
561 workflow runs
561 workflow runs

Filter by Event

⌥ + click/return to exclude

Filter by Status

⌥ + click/return to exclude

Filter by Branch

⌥ + click/return to exclude

Filter by Actor

⌥ + click/return to exclude
Update BATS core to 1.14 Check for merge conflicts #1820: Pull request #2061 synchronize by yubiuser
6s
6s
Set TERM if not set Check for merge conflicts #1819: Commit d1fcd34 pushed by yubiuser
7s update/bats
update/bats
7s
Update BATS core to 1.14 Check for merge conflicts #1818: Commit 7971c9b pushed by yubiuser
6s update/bats
update/bats
6s
Merge pull request #2060 from pi-hole/dependabot/github_actions/devel… Check for merge conflicts #1817: Commit 32152b5 pushed by yubiuser
2m 6s development
development
2m 6s
build(deps): Bump docker/github-builder/.github/workflows/build.yml Check for merge conflicts #1816: Commit 4829f9d pushed by dependabot Bot
7s dependabot/github_actions/development/github_action-dependencies-9687a9ed2e
dependabot/github_actions/development/github_action-dependencies-9687a9ed2e
7s
Merge pull request #2058 from pi-hole/dependabot/github_actions/devel… Check for merge conflicts #1815: Commit 95c74b8 pushed by yubiuser
2m 6s development
development
2m 6s
build(deps): Bump the github_action-dependencies group across 1 direc… Check for merge conflicts #1814: Commit 1f8b0e5 pushed by dependabot Bot
6s dependabot/github_actions/development/github_action-dependencies-a6b89ff821
dependabot/github_actions/development/github_action-dependencies-a6b89ff821
6s
ci: throwaway workflow_dispatch build for FTL new/dot-doh-client Check for merge conflicts #1813: Commit fc48b28 pushed by PromoFaux
8s test/dot-doh-client
test/dot-doh-client
8s
Merge branch 'fix/logrotate' and resolve merge conflicts Check for merge conflicts #1812: Commit dd91b48 pushed by PromoFaux
9s 2026.07.2
2026.07.2
9s
Merge branch 'fix/logrotate' and resolve merge conflicts Check for merge conflicts #1811: Commit dd91b48 pushed by PromoFaux
2m 9s master
master
2m 9s
Merge branch 'fix/logrotate' and resolve merge conflicts Check for merge conflicts #1810: Commit dd91b48 pushed by PromoFaux
2m 10s development
development
2m 10s
Merge pull request #2055 from pi-hole/master Check for merge conflicts #1809: Commit c8ef3c8 pushed by PromoFaux
2m 5s development
development
2m 5s
Merge pull request #2057 from pi-hole/development Check for merge conflicts #1808: Commit 76dd0e1 pushed by PromoFaux
25s 2026.07.1
2026.07.1
25s
Sync master back into development Check for merge conflicts #1807: Pull request #2055 synchronize by PromoFaux
20s
20s
Merge pull request #2057 from pi-hole/development Check for merge conflicts #1806: Commit 76dd0e1 pushed by PromoFaux
2m 5s master
master
2m 5s
Merge pull request #2056 from casperklein/no-cache Check for merge conflicts #1805: Commit 9be81c0 pushed by PromoFaux
2m 8s development
development
2m 8s
Merge pull request #2054 from pi-hole/development Check for merge conflicts #1804: Commit 9f11ef3 pushed by PromoFaux
6s 2026.07.0
2026.07.0
6s
Merge pull request #2054 from pi-hole/development Check for merge conflicts #1803: Commit 9f11ef3 pushed by PromoFaux
2m 9s master
master
2m 9s
Merge pull request #2053 from pi-hole/dependabot/github_actions/devel… Check for merge conflicts #1802: Commit a0db79a pushed by PromoFaux
2m 7s development
development
2m 7s
build(deps): Bump docker/setup-qemu-action Check for merge conflicts #1801: Commit 300cc1c pushed by dependabot Bot
9s dependabot/github_actions/development/github_action-dependencies-04ba74b0fc
dependabot/github_actions/development/github_action-dependencies-04ba74b0fc
9s
Merge pull request #2052 from pi-hole/dependabot/github_actions/devel… Check for merge conflicts #1800: Commit 1614454 pushed by yubiuser
2m 9s development
development
2m 9s
build(deps): Bump actions/checkout from 6.0.3 to 7.0.0 in the github_action-dependencies group across 1 directory Check for merge conflicts #1799: Pull request #2052 synchronize by dependabot Bot
10s
10s
build(deps): Bump actions/checkout Check for merge conflicts #1798: Commit b4e18e4 pushed by dependabot Bot
7s dependabot/github_actions/development/github_action-dependencies-2217aebe03
dependabot/github_actions/development/github_action-dependencies-2217aebe03
7s
Merge pull request #2051 from pi-hole/dependabot/docker/src/developme… Check for merge conflicts #1797: Commit 019e37c pushed by yubiuser
2m 7s development
development
2m 7s
build(deps): Bump actions/checkout Check for merge conflicts #1796: Commit 68fdd78 pushed by dependabot Bot
29s dependabot/github_actions/development/github_action-dependencies-2217aebe03
dependabot/github_actions/development/github_action-dependencies-2217aebe03
29s