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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Bump docker/build-push-action from 5 to 6 Check for merge conflicts #864: Pull request #1604 synchronize by dependabot bot
June 24, 2024 18:08 10s
June 24, 2024 18:08 10s
Bump docker/build-push-action from 5 to 6 Check for merge conflicts #863: Commit f610db6 pushed by dependabot bot
June 24, 2024 18:08 10s dependabot/github_actions/development-v6/docker/build-push-action-6
dependabot/github_actions/development-v6/docker/build-push-action-6
June 24, 2024 18:08 10s
Merge pull request #1607 from pi-hole/tweaks Check for merge conflicts #862: Commit 9520967 pushed by PromoFaux
June 24, 2024 18:07 10s development-v6
development-v6
June 24, 2024 18:07 10s
Add support for choosing PADD branch in build script Check for merge conflicts #861: Pull request #1607 synchronize by yubiuser
June 24, 2024 18:01 11s
June 24, 2024 18:01 11s
Remove entrypoint.sh as it is not needed Check for merge conflicts #860: Commit d28c37e pushed by yubiuser
June 24, 2024 18:01 11s tweaks
tweaks
June 24, 2024 18:01 11s
Add support for choosing PADD branch in build script Check for merge conflicts #859: Pull request #1607 synchronize by yubiuser
June 24, 2024 17:55 17s
June 24, 2024 17:55 17s
Remove entrypoint.sh as it is not needed Check for merge conflicts #858: Commit 19c4a82 pushed by yubiuser
June 24, 2024 17:55 11s tweaks
tweaks
June 24, 2024 17:55 11s
Add support for choosing PADD branch in build script Check for merge conflicts #857: Pull request #1607 synchronize by yubiuser
June 24, 2024 17:51 13s
June 24, 2024 17:51 13s
Remove entrypoint.sh as it is not needed Check for merge conflicts #856: Commit 194f909 pushed by yubiuser
June 24, 2024 17:51 14s tweaks
tweaks
June 24, 2024 17:51 14s
Merge pull request #1605 from pi-hole/dependabot/github_actions/dev/d… Check for merge conflicts #855: Commit d4836d2 pushed by PromoFaux
June 22, 2024 11:50 10s dev
dev
June 22, 2024 11:50 10s
Add support for choosing PADD branch in build script Check for merge conflicts #854: Pull request #1607 synchronize by PromoFaux
June 22, 2024 11:44 10s
June 22, 2024 11:44 10s
silende JSONArgsRecommended warning in test build Check for merge conflicts #853: Commit 20145db pushed by PromoFaux
June 22, 2024 11:44 10s tweaks
tweaks
June 22, 2024 11:44 10s
Add support for choosing PADD branch in build script Check for merge conflicts #852: Pull request #1607 synchronize by PromoFaux
June 22, 2024 11:36 12s
June 22, 2024 11:36 12s
Not sure how this ever worked, or why it has suddenly started causing… Check for merge conflicts #851: Commit 425ecb3 pushed by PromoFaux
June 22, 2024 11:36 11s tweaks
tweaks
June 22, 2024 11:36 11s
Add support for choosing PADD branch in build script Check for merge conflicts #850: Pull request #1607 synchronize by PromoFaux
June 22, 2024 11:36 9s
June 22, 2024 11:36 9s
Not sure how this ever worked, or why it has suddenly started causing… Check for merge conflicts #849: Commit e1f2a5f pushed by PromoFaux
June 22, 2024 11:36 9s tweaks
tweaks
June 22, 2024 11:36 9s
Add support for choosing PADD branch in build script Check for merge conflicts #848: Pull request #1607 synchronize by PromoFaux
June 22, 2024 11:31 10s
June 22, 2024 11:31 10s
Not sure how this ever worked, or why it has suddenly started causing… Check for merge conflicts #847: Commit fc5be81 pushed by PromoFaux
June 22, 2024 11:31 9s tweaks
tweaks
June 22, 2024 11:31 9s
Add PADD branch switch to build script. Fix casing of as->AS in Docke… Check for merge conflicts #846: Commit f9dd3df pushed by PromoFaux
June 22, 2024 11:21 10s tweaks
tweaks
June 22, 2024 11:21 10s
Bump docker/build-push-action from 5 to 6 Check for merge conflicts #845: Commit 859e71b pushed by dependabot bot
June 22, 2024 10:42 10s dependabot/github_actions/dev/docker/build-push-action-6
dependabot/github_actions/dev/docker/build-push-action-6
June 22, 2024 10:42 10s
Bump docker/build-push-action from 5 to 6 Check for merge conflicts #844: Commit 2e1eba1 pushed by dependabot bot
June 22, 2024 10:18 10s dependabot/github_actions/development-v6/docker/build-push-action-6
dependabot/github_actions/development-v6/docker/build-push-action-6
June 22, 2024 10:18 10s
Merge pull request #1601 from pi-hole/master Check for merge conflicts #843: Commit fcacd2f pushed by PromoFaux
June 16, 2024 09:31 11s dev
dev
June 16, 2024 09:31 11s
Merge pull request #1600 from pi-hole/dev Check for merge conflicts #842: Commit 4149693 pushed by PromoFaux
June 16, 2024 09:30 10s 2024.06.0
2024.06.0
June 16, 2024 09:30 10s
Merge pull request #1600 from pi-hole/dev Check for merge conflicts #841: Commit 4149693 pushed by PromoFaux
June 16, 2024 09:26 2m 10s master
master
June 16, 2024 09:26 2m 10s
Merge pull request #1599 from pi-hole/tweak/386-workaround Check for merge conflicts #840: Commit f60e958 pushed by PromoFaux
June 15, 2024 16:54 10s dev
dev
June 15, 2024 16:54 10s