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
Utilise the FTL post-stop script that we install during container build. Check for merge conflicts #1318: Commit 0c1fdcf pushed by PromoFaux
8s fix/1789-maybe
fix/1789-maybe
8s
Move FTL cleanup to dedicated function and include removing the PID i… Check for merge conflicts #1317: Commit acb26cc pushed by PromoFaux
6s fix/1789-maybe
fix/1789-maybe
6s
Merge pull request #1875 from pi-hole/dependabot/pip/test/development… Check for merge conflicts #1316: Commit e0bba16 pushed by yubiuser
2m 12s development
development
2m 12s
Bump tox from 4.28.3 to 4.28.4 in /test Check for merge conflicts #1315: Commit 5aadf06 pushed by dependabot Bot
9s dependabot/pip/test/development/tox-4.28.4
dependabot/pip/test/development/tox-4.28.4
9s
Merge pull request #1873 from pi-hole/dependabot/pip/test/development… Check for merge conflicts #1314: Commit 27fc8ac pushed by yubiuser
2m 7s development
development
2m 7s
Bump tox from 4.27.0 to 4.28.3 in /test Check for merge conflicts #1313: Commit 9285588 pushed by dependabot Bot
5s dependabot/pip/test/development/tox-4.28.3
dependabot/pip/test/development/tox-4.28.3
5s
Merge pull request #1872 from pi-hole/master Check for merge conflicts #1312: Commit 5b3d3f4 pushed by PromoFaux
2m 7s development
development
2m 7s
Merge pull request #1871 from pi-hole/tweak/README Check for merge conflicts #1311: Commit 2e16c1b pushed by PromoFaux
8s master
master
8s
Add link to "Changed Environment Variables" Check for merge conflicts #1310: Commit 39bb4d4 pushed by rdwebdesign
7s tweak/README
tweak/README
7s
Merge pull request #1870 from pi-hole/remove/nc Check for merge conflicts #1309: Commit bd31bc0 pushed by PromoFaux
2m 11s development
development
2m 11s
Merge pull request #1869 from pi-hole/tweak/master Check for merge conflicts #1308: Commit 6576bfb pushed by PromoFaux
2m 9s development
development
2m 9s
Only clone depth 1, even when checking out tags Check for merge conflicts #1307: Pull request #1869 synchronize by yubiuser
9s
9s
Simplify variable names Check for merge conflicts #1306: Commit 0023474 pushed by yubiuser
8s tweak/master
tweak/master
8s
Only clone depth 1, even when checking out tags Check for merge conflicts #1305: Pull request #1869 synchronize by yubiuser
8s
8s
Use a function to reduce code duplication Check for merge conflicts #1304: Commit 3b50268 pushed by yubiuser
6s tweak/master
tweak/master
6s
Remove ncat dependency Check for merge conflicts #1303: Commit 92429e3 pushed by yubiuser
8s remove/nc
remove/nc
8s
Only clone depth 1 when checking out tags Check for merge conflicts #1302: Commit b6ab417 pushed by yubiuser
9s tweak/master
tweak/master
9s
Merge pull request #1868 from pi-hole/master Check for merge conflicts #1301: Commit 03eb0dd pushed by yubiuser
2m 6s development
development
2m 6s
Merge pull request #1867 from pi-hole/development Check for merge conflicts #1300: Commit b2064c8 pushed by PromoFaux
5s 2025.07.1
2025.07.1
5s
Merge pull request #1867 from pi-hole/development Check for merge conflicts #1299: Commit b2064c8 pushed by PromoFaux
6s master
master
6s
Merge pull request #1866 from pi-hole/slightly-deeper-clone Check for merge conflicts #1298: Commit 1f618bb pushed by PromoFaux
2m 6s development
development
2m 6s
Increase the depth of the clone by a little to account for there pote… Check for merge conflicts #1297: Commit d1e0e78 pushed by PromoFaux
9s slightly-deeper-clone
slightly-deeper-clone
9s
Merge pull request #1864 from pi-hole/development Check for merge conflicts #1296: Commit 875cf63 pushed by PromoFaux
8s 2025.07.0
2025.07.0
8s
Merge pull request #1865 from pi-hole/master Check for merge conflicts #1295: Commit 7de38f9 pushed by PromoFaux
2m 10s development
development
2m 10s
Merge pull request #1864 from pi-hole/development Check for merge conflicts #1294: Commit 875cf63 pushed by PromoFaux
7s master
master
7s
ProTip! You can narrow down the results and go further in time using created:<2025-07-14 or the other filters available.