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
Merge pull request #2029 from pi-hole/development Check for merge conflicts #1745: Commit bd60ba3 pushed by PromoFaux
8s 2026.04.1
2026.04.1
8s
Merge pull request #2029 from pi-hole/development Check for merge conflicts #1744: Commit bd60ba3 pushed by PromoFaux
6s master
master
6s
Merge pull request #2028 from pi-hole/dependabot/github_actions/devel… Check for merge conflicts #1743: Commit 7861485 pushed by yubiuser
2m 8s development
development
2m 8s
build(deps): Bump docker/github-builder/.github/workflows/build.yml from 1.5.0 to 1.6.0 in the github_action-dependencies group across 1 directory Check for merge conflicts #1742: Pull request #2028 synchronize by dependabot Bot
6s
6s
build(deps): Bump docker/github-builder/.github/workflows/build.yml Check for merge conflicts #1741: Commit 8aec787 pushed by dependabot Bot
8s dependabot/github_actions/development/github_action-dependencies-9a1c7410c5
dependabot/github_actions/development/github_action-dependencies-9a1c7410c5
8s
Merge pull request #2027 from pi-hole/dependabot/docker/src/developme… Check for merge conflicts #1740: Commit 6d57bc2 pushed by yubiuser
2m 6s development
development
2m 6s
build(deps): Bump docker/github-builder/.github/workflows/build.yml Check for merge conflicts #1739: Commit baf4006 pushed by dependabot Bot
6s dependabot/github_actions/development/github_action-dependencies-9a1c7410c5
dependabot/github_actions/development/github_action-dependencies-9a1c7410c5
6s
build(deps): Bump alpine from 3.23.3 to 3.23.4 in /src Check for merge conflicts #1738: Commit a9797a8 pushed by dependabot Bot
8s dependabot/docker/src/development/alpine-3.23.4
dependabot/docker/src/development/alpine-3.23.4
8s
Merge pull request #2026 from pi-hole/master Check for merge conflicts #1737: Commit 9d8bf04 pushed by PromoFaux
2m 6s development
development
2m 6s
Merge pull request #2025 from SirRGB/development Check for merge conflicts #1736: Commit 4f16f4f pushed by PromoFaux
6s master
master
6s
docs: update capability documentation links Check for merge conflicts #1735: Pull request #2025 synchronize by SirRGB
8s
8s
docs: update capability documentation links Check for merge conflicts #1734: Pull request #2025 synchronize by SirRGB
9s
9s
Merge pull request #2023 from pi-hole/development Check for merge conflicts #1733: Commit efe4c7f pushed by PromoFaux
8s 2026.04.0
2026.04.0
8s
Merge pull request #2024 from pi-hole/master Check for merge conflicts #1732: Commit c545a25 pushed by PromoFaux
2m 8s development
development
2m 8s
Merge pull request #2023 from pi-hole/development Check for merge conflicts #1731: Commit efe4c7f pushed by PromoFaux
7s master
master
7s
Merge pull request #2022 from pi-hole/1.5.0 Check for merge conflicts #1730: Commit 48b3799 pushed by PromoFaux
2m 9s development
development
2m 9s
Update github-builder to v1.5.0 and enable fail-fast Check for merge conflicts #1729: Commit e41cc38 pushed by yubiuser
10s 1.5.0
1.5.0
10s
Caps Check for merge conflicts #1728: Pull request #1814 synchronize by PromoFaux
7s
7s
Apply reviewer's suggestions Check for merge conflicts #1727: Commit 78ffcbe pushed by PromoFaux
7s caps
caps
7s
Merge pull request #2021 from crazy-max/publish-on-pr Check for merge conflicts #1726: Commit 082bb8c pushed by PromoFaux
2m 8s development
development
2m 8s
Caps Check for merge conflicts #1725: Pull request #1814 synchronize by PromoFaux
6s
6s
Apply reviewer's suggestions Check for merge conflicts #1724: Commit 42f9faf pushed by PromoFaux
6s caps
caps
6s
Merge pull request #2020 from pi-hole/no-sign Check for merge conflicts #1723: Commit 8935ed3 pushed by PromoFaux
2m 7s development
development
2m 7s
Merge pull request #2015 from pi-hole/claude-review Check for merge conflicts #1722: Commit a856b71 pushed by PromoFaux
2m 10s development
development
2m 10s
Various AI inspired code changes (And MOAR TESTS) Check for merge conflicts #1721: Pull request #2015 synchronize by PromoFaux
9s
9s