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
build(deps): Bump alpine from 3.24.0 to 3.24.1 in /src Check for merge conflicts #1795: Commit d05c336 pushed by dependabot Bot
6s dependabot/docker/src/development/alpine-3.24.1
dependabot/docker/src/development/alpine-3.24.1
6s
Merge pull request #2050 from pi-hole/master Check for merge conflicts #1794: Commit 1f224b8 pushed by PromoFaux
2m 10s development
development
2m 10s
Merge pull request #2049 from pi-hole/tweak/caching Check for merge conflicts #1793: Commit c4c8bf6 pushed by PromoFaux
2m 15s master
master
2m 15s
Merge pull request #2048 from pi-hole/master Check for merge conflicts #1792: Commit b2ec0d5 pushed by yubiuser
2m 6s development
development
2m 6s
remove buildkit cache mount from apk add layer Check for merge conflicts #1791: Commit 840c084 pushed by PromoFaux
9s tweak/caching
tweak/caching
9s
Merge pull request #2047 from pi-hole/development Check for merge conflicts #1790: Commit e29df74 pushed by PromoFaux
2m 8s master
master
2m 8s
Update base alpine to 3.24 Check for merge conflicts #1789: Pull request #2046 synchronize by PromoFaux
8s
8s
Update base alpine to 3.24 Check for merge conflicts #1788: Commit 4da965a pushed by PromoFaux
8s update/alpine-base
update/alpine-base
8s
Update base alpine to 3.24 Check for merge conflicts #1787: Commit d67e59d pushed by PromoFaux
7s update/alpine-base
update/alpine-base
7s
Merge pull request #2029 from pi-hole/development Check for merge conflicts #1786: Commit bd60ba3 pushed by PromoFaux
12s 2026.06.0
2026.06.0
12s
Merge pull request #2045 from pi-hole/dependabot/github_actions/devel… Check for merge conflicts #1785: Commit 2c358fd pushed by yubiuser
2m 7s development
development
2m 7s
build(deps): Bump docker/github-builder/.github/workflows/build.yml Check for merge conflicts #1784: Commit 16518d0 pushed by dependabot Bot
9s dependabot/github_actions/development/github_action-dependencies-2f82731bb3
dependabot/github_actions/development/github_action-dependencies-2f82731bb3
9s
Merge pull request #2044 from pi-hole/dependabot/docker/src/developme… Check for merge conflicts #1783: Commit 9be9abb pushed by yubiuser
2m 7s development
development
2m 7s
build(deps): Bump alpine from 3.23.4 to 3.24.0 in /src Check for merge conflicts #1782: Commit 5edbfa2 pushed by dependabot Bot
8s dependabot/docker/src/development/alpine-3.24.0
dependabot/docker/src/development/alpine-3.24.0
8s
Merge pull request #2041 from pi-hole/dependabot/github_actions/devel… Check for merge conflicts #1781: Commit 1f28459 pushed by yubiuser
2m 6s development
development
2m 6s
build(deps): Bump the github_action-dependencies group across 1 direc… Check for merge conflicts #1780: Commit e7cc091 pushed by dependabot Bot
7s dependabot/github_actions/development/github_action-dependencies-c3f379e2be
dependabot/github_actions/development/github_action-dependencies-c3f379e2be
7s
Merge pull request #2038 from lightswitch05/feat/optimize-build-cache Check for merge conflicts #1779: Commit 90e1e23 pushed by PromoFaux
2m 10s development
development
2m 10s
feat: optimize Docker build caching Check for merge conflicts #1778: Pull request #2038 synchronize by lightswitch05
10s
10s
feat: optimize Docker build caching Check for merge conflicts #1777: Pull request #2038 synchronize by lightswitch05
11s
11s
feat: optimize Docker build caching Check for merge conflicts #1776: Pull request #2038 synchronize by lightswitch05
10s
10s
feat: optimize Docker build caching Check for merge conflicts #1775: Pull request #2038 synchronize by lightswitch05
8s
8s
Use structed json logging Check for merge conflicts #1774: Pull request #2036 synchronize by yubiuser
11s
11s
Remove TAIL_FTL_LOG option and start FTL with --log-json Check for merge conflicts #1773: Commit a4a01a3 pushed by yubiuser
9s log_json
log_json
9s
Use structed json logging Check for merge conflicts #1772: Pull request #2036 synchronize by yubiuser
11s
11s
Remove TAIL_FTL_LOG option and start FTL with --log-json Check for merge conflicts #1771: Commit c32e5ab pushed by yubiuser
8s log_json
log_json
8s