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
556 workflow runs
556 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Bump docker/setup-buildx-action from 3.11.1 to 3.12.0 Check for merge conflicts #1568: Pull request #1974 synchronize by dependabot bot
6s
6s
Bump docker/setup-buildx-action from 3.11.1 to 3.12.0 Check for merge conflicts #1567: Commit db354fb pushed by dependabot bot
8s dependabot/github_actions/development/docker/setup-buildx-action-3.12.0
dependabot/github_actions/development/docker/setup-buildx-action-3.12.0
8s
Merge pull request #1973 from pi-hole/dependabot/docker/src/developme… Check for merge conflicts #1566: Commit a221db2 pushed by yubiuser
2m 7s development
development
2m 7s
Bump docker/setup-buildx-action from 3.11.1 to 3.12.0 Check for merge conflicts #1565: Commit 317f22f pushed by dependabot bot
8s dependabot/github_actions/development/docker/setup-buildx-action-3.12.0
dependabot/github_actions/development/docker/setup-buildx-action-3.12.0
8s
Bump alpine from 3.23.0 to 3.23.2 in /src Check for merge conflicts #1564: Commit 9227255 pushed by dependabot bot
7s dependabot/docker/src/development/alpine-3.23.2
dependabot/docker/src/development/alpine-3.23.2
7s
Include an experimental tag for... experiments. Check for merge conflicts #1563: Commit 821ed11 pushed by PromoFaux
8s experimental
experimental
8s
Readme Rework Check for merge conflicts #1562: Pull request #1958 synchronize by PromoFaux
9s
9s
Keep docker tag information on the README file Check for merge conflicts #1561: Commit 4f67f37 pushed by PromoFaux
9s dockerdocs
dockerdocs
9s
don't build non-buildables Check for merge conflicts #1560: Commit 2e9d4ba pushed by PromoFaux
6s experimental
experimental
6s
This wont make a difference... Check for merge conflicts #1559: Commit 939a905 pushed by PromoFaux
19s experimental
experimental
19s
Not 100% if this will make any difference Check for merge conflicts #1558: Commit c8d7e5b pushed by PromoFaux
9s experimental
experimental
9s
Not 100% if this will make any difference Check for merge conflicts #1557: Commit 44dd711 pushed by PromoFaux
13s experimental
experimental
13s
Merge pull request #1970 from pi-hole/gha-perms Check for merge conflicts #1556: Commit 9fbc31d pushed by PromoFaux
2m 7s development
development
2m 7s
Add permissions section to workflows for content access Check for merge conflicts #1555: Commit c97651f pushed by PromoFaux
7s gha-perms
gha-perms
7s
Add permissions section to workflows for content access Check for merge conflicts #1554: Commit c7edeb5 pushed by PromoFaux
6s gha-perms
gha-perms
6s
Merge pull request #1968 from pi-hole/dependabot/github_actions/devel… Check for merge conflicts #1553: Commit 4cec89b pushed by yubiuser
2m 9s development
development
2m 9s
Bump actions/upload-artifact from 5.0.0 to 6.0.0 Check for merge conflicts #1552: Pull request #1968 synchronize by dependabot bot
8s
8s
Bump actions/upload-artifact from 5.0.0 to 6.0.0 Check for merge conflicts #1551: Commit 8b14ada pushed by dependabot bot
8s dependabot/github_actions/development/actions/upload-artifact-6.0.0
dependabot/github_actions/development/actions/upload-artifact-6.0.0
8s
Merge pull request #1967 from pi-hole/dependabot/github_actions/devel… Check for merge conflicts #1550: Commit eb44d19 pushed by yubiuser
2m 7s development
development
2m 7s
Bump actions/download-artifact from 6.0.0 to 7.0.0 Check for merge conflicts #1549: Pull request #1967 synchronize by dependabot bot
6s
6s
Bump actions/download-artifact from 6.0.0 to 7.0.0 Check for merge conflicts #1548: Commit c245faa pushed by dependabot bot
7s dependabot/github_actions/development/actions/download-artifact-7.0.0
dependabot/github_actions/development/actions/download-artifact-7.0.0
7s
Merge pull request #1966 from pi-hole/dependabot/pip/test/development… Check for merge conflicts #1547: Commit bca29b1 pushed by yubiuser
2m 8s development
development
2m 8s
Bump actions/upload-artifact from 5.0.0 to 6.0.0 Check for merge conflicts #1546: Commit a98184b pushed by dependabot bot
13s dependabot/github_actions/development/actions/upload-artifact-6.0.0
dependabot/github_actions/development/actions/upload-artifact-6.0.0
13s
Bump actions/download-artifact from 6.0.0 to 7.0.0 Check for merge conflicts #1545: Commit 9f76c0b pushed by dependabot bot
7s dependabot/github_actions/development/actions/download-artifact-7.0.0
dependabot/github_actions/development/actions/download-artifact-7.0.0
7s
Bump pytest from 9.0.1 to 9.0.2 in /test Check for merge conflicts #1544: Commit 50a6b00 pushed by dependabot bot
12s dependabot/pip/test/development/pytest-9.0.2
dependabot/pip/test/development/pytest-9.0.2
12s