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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #1674 from pi-hole/fix/caddy Check for merge conflicts #1041: Commit bfcdafc pushed by yubiuser
December 22, 2024 19:16 2m 10s development
development
December 22, 2024 19:16 2m 10s
Pi-hole does not provide DNS-over-TLS Check for merge conflicts #1040: Commit 4a17221 pushed by yubiuser
December 22, 2024 13:42 9s fix/caddy
fix/caddy
December 22, 2024 13:42 9s
Updated the instructions to free up port 53 in Fedora Check for merge conflicts #1039: Pull request #1660 synchronize by OptimoSupreme
December 16, 2024 11:28 11s
December 16, 2024 11:28 11s
Merge pull request #1671 from pi-hole/alpine_321 Check for merge conflicts #1038: Commit 4aecdbe pushed by rdwebdesign
December 9, 2024 20:40 2m 12s development
development
December 9, 2024 20:40 2m 12s
Update base image to Alpine 3.21 Check for merge conflicts #1037: Commit 6721fa2 pushed by rdwebdesign
December 9, 2024 18:36 10s alpine_321
alpine_321
December 9, 2024 18:36 10s
Merge pull request #1669 from pi-hole/dependabot/pip/test/development… Check for merge conflicts #1036: Commit 1daf4e2 pushed by yubiuser
December 7, 2024 14:33 2m 13s development
development
December 7, 2024 14:33 2m 13s
Bump pytest from 8.3.3 to 8.3.4 in /test Check for merge conflicts #1035: Commit d722db6 pushed by dependabot bot
December 7, 2024 10:42 10s dependabot/pip/test/development/pytest-8.3.4
dependabot/pip/test/development/pytest-8.3.4
December 7, 2024 10:42 10s
Merge pull request #1644 from pi-hole/sanity-check-downloaded-FTL Check for merge conflicts #1034: Commit 40386c8 pushed by DL6ER
November 22, 2024 17:37 2m 11s development
development
November 22, 2024 17:37 2m 11s
Bump aiohttp in /test in the pip group across 1 directory Check for merge conflicts #1033: Commit 851b1f1 pushed by dependabot bot
November 18, 2024 23:02 12s dependabot/pip/test/pip-cef70b0dd7
dependabot/pip/test/pip-cef70b0dd7
November 18, 2024 23:02 12s
Updated the instructions to free up port 53 in Fedora Check for merge conflicts #1032: Pull request #1660 synchronize by OptimoSupreme
November 16, 2024 19:57 11s
November 16, 2024 19:57 11s
Updated the instructions to free up port 53 in Fedora Check for merge conflicts #1031: Pull request #1660 synchronize by OptimoSupreme
November 16, 2024 19:51 13s
November 16, 2024 19:51 13s
Updated the instructions to free up port 53 in Fedora Check for merge conflicts #1030: Pull request #1660 synchronize by OptimoSupreme
November 16, 2024 19:35 11s
November 16, 2024 19:35 11s
Merge pull request #1659 from pi-hole/dependabot/github_actions/devel… Check for merge conflicts #1029: Commit eb8b5af pushed by yubiuser
November 16, 2024 11:29 2m 11s development
development
November 16, 2024 11:29 2m 11s
Bump Chizkiyahu/delete-untagged-ghcr-action from 4 to 5 Check for merge conflicts #1028: Commit 7e0c93b pushed by dependabot bot
November 16, 2024 10:23 10s dependabot/github_actions/development/Chizkiyahu/delete-untagged-ghcr-action-5
dependabot/github_actions/development/Chizkiyahu/delete-untagged-ghcr-action-5
November 16, 2024 10:23 10s
Merge pull request #1646 from pi-hole/tweak/README_v6 Check for merge conflicts #1027: Commit 4e1a66a pushed by rdwebdesign
November 9, 2024 22:45 2m 10s development
development
November 9, 2024 22:45 2m 10s
Tweak README text and formatting Check for merge conflicts #1026: Pull request #1646 synchronize by PromoFaux
November 3, 2024 15:57 10s
November 3, 2024 15:57 10s
Update README.md Check for merge conflicts #1025: Commit 8faa60a pushed by PromoFaux
November 3, 2024 15:57 13s tweak/README_v6
tweak/README_v6
November 3, 2024 15:57 13s
Tweak README text and formatting Check for merge conflicts #1024: Pull request #1646 synchronize by rdwebdesign
October 28, 2024 19:07 12s
October 28, 2024 19:07 12s
Improve BREAKING CHANGES text Check for merge conflicts #1023: Commit be8e292 pushed by rdwebdesign
October 28, 2024 19:07 10s tweak/README_v6
tweak/README_v6
October 28, 2024 19:07 10s
logrotate: fix permissions on configfile Check for merge conflicts #1022: Pull request #1655 synchronize by quinte17
October 27, 2024 06:24 13s
October 27, 2024 06:24 13s
Update branch name in sync-back-to-dev workflow Check for merge conflicts #1021: Commit 4cb3c3a pushed by PromoFaux
October 14, 2024 21:59 14s test
test
October 14, 2024 21:59 14s
Update branch name in sync-back-to-dev workflow Check for merge conflicts #1020: Commit 4cb3c3a pushed by PromoFaux
October 14, 2024 21:55 11s test
test
October 14, 2024 21:55 11s
Merge pull request #1652 from pi-hole/dependabot/pip/test/development… Check for merge conflicts #1019: Commit 3470a39 pushed by yubiuser
October 12, 2024 14:17 2m 11s development
development
October 12, 2024 14:17 2m 11s
Bump black from 24.8.0 to 24.10.0 in /test Check for merge conflicts #1018: Commit 8f376ea pushed by dependabot bot
October 12, 2024 10:53 10s dependabot/pip/test/development/black-24.10.0
dependabot/pip/test/development/black-24.10.0
October 12, 2024 10:53 10s
Merge pull request #1651 from pi-hole/tini-not-needed Check for merge conflicts #1017: Commit e5277ce pushed by PromoFaux
October 11, 2024 17:48 2m 14s development
development
October 11, 2024 17:48 2m 14s