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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

bump alpine to 3.20 Check for merge conflicts #889: Commit 81e589f pushed by PromoFaux
August 6, 2024 11:33 11s update-alpine
update-alpine
August 6, 2024 11:33 11s
Merge pull request #1620 from pi-hole/dependabot/pip/test/dev/black-2… Check for merge conflicts #888: Commit 6239412 pushed by yubiuser
August 3, 2024 11:42 13s dev
dev
August 3, 2024 11:42 13s
Bump black from 24.4.2 to 24.8.0 in /test Check for merge conflicts #887: Commit 9a48b6d pushed by dependabot bot
August 3, 2024 10:54 10s dependabot/pip/test/dev/black-24.8.0
dependabot/pip/test/dev/black-24.8.0
August 3, 2024 10:54 10s
Merge pull request #1615 from loeffelpan/dev Check for merge conflicts #886: Commit 6568baf pushed by PromoFaux
July 28, 2024 17:29 10s dev
dev
July 28, 2024 17:29 10s
Merge pull request #1616 from pi-hole/dependabot/pip/test/dev/pytest-… Check for merge conflicts #885: Commit 5e7d0b0 pushed by yubiuser
July 27, 2024 11:42 2m 11s dev
dev
July 27, 2024 11:42 2m 11s
Bump pytest from 8.2.2 to 8.3.2 in /test Check for merge conflicts #884: Commit 69da4b2 pushed by dependabot bot
July 27, 2024 10:10 9s dependabot/pip/test/dev/pytest-8.3.2
dependabot/pip/test/dev/pytest-8.3.2
July 27, 2024 10:10 9s
Add DNSMASQ_LISTENING=bind to README.md Check for merge conflicts #883: Pull request #1615 synchronize by loeffelpan
July 27, 2024 08:42 10s
July 27, 2024 08:42 10s
Merge pull request #1612 from pi-hole/master Check for merge conflicts #882: Commit bdd1278 pushed by PromoFaux
July 5, 2024 23:17 10s dev
dev
July 5, 2024 23:17 10s
Merge pull request #1611 from pi-hole/dev Check for merge conflicts #881: Commit d4dd6b0 pushed by PromoFaux
July 5, 2024 21:40 2m 10s master
master
July 5, 2024 21:40 2m 10s
Merge pull request #1600 from pi-hole/dev Check for merge conflicts #880: Commit 4149693 pushed by PromoFaux
July 5, 2024 18:17 10s 2024.07.0
2024.07.0
July 5, 2024 18:17 10s
Merge pull request #1609 from pi-hole/pretty_fail Check for merge conflicts #879: Commit a3633a1 pushed by yubiuser
July 2, 2024 19:20 14s development-v6
development-v6
July 2, 2024 19:20 14s
Add pytest-clarity to test environment to improve error log output Check for merge conflicts #878: Pull request #1609 synchronize by yubiuser
July 2, 2024 19:14 12s
July 2, 2024 19:14 12s
Set column width to 120 Check for merge conflicts #877: Commit c26e71e pushed by yubiuser
July 2, 2024 19:14 11s pretty_fail
pretty_fail
July 2, 2024 19:14 11s
Merge pull request #1608 from pi-hole/v6/default-upstream Check for merge conflicts #876: Commit e26f366 pushed by PromoFaux
July 2, 2024 19:14 9s development-v6
development-v6
July 2, 2024 19:14 9s
Update src/bash_functions.sh Check for merge conflicts #875: Commit 2922fbd pushed by PromoFaux
July 2, 2024 19:02 12s v6/default-upstream
v6/default-upstream
July 2, 2024 19:02 12s
Default DNS Upstream Check for merge conflicts #874: Pull request #1608 synchronize by PromoFaux
July 2, 2024 19:02 10s
July 2, 2024 19:02 10s
Add pytest-clarity to test environment to improve error log output Check for merge conflicts #873: Pull request #1609 synchronize by yubiuser
July 2, 2024 06:20 13s
July 2, 2024 06:20 13s
Set column width to 120 Check for merge conflicts #872: Commit 6534f7f pushed by yubiuser
July 2, 2024 06:20 12s pretty_fail
pretty_fail
July 2, 2024 06:20 12s
Add pytest-clarity to test environment to improve error log output Check for merge conflicts #871: Commit e82cfd9 pushed by yubiuser
July 1, 2024 19:00 12s pretty_fail
pretty_fail
July 1, 2024 19:00 12s
Default DNS Upstream Check for merge conflicts #870: Pull request #1608 synchronize by yubiuser
June 30, 2024 21:30 11s
June 30, 2024 21:30 11s
Using grep instead of tailing FTL.log as func.stdout only captures a … Check for merge conflicts #869: Commit 99f459e pushed by yubiuser
June 30, 2024 21:30 10s v6/default-upstream
v6/default-upstream
June 30, 2024 21:30 10s
Default DNS Upstream Check for merge conflicts #868: Pull request #1608 synchronize by PromoFaux
June 30, 2024 20:22 10s
June 30, 2024 20:22 10s
Default upstream DNS to Google and remove the mention of the environm… Check for merge conflicts #867: Commit a7565e2 pushed by PromoFaux
June 30, 2024 20:22 12s v6/default-upstream
v6/default-upstream
June 30, 2024 20:22 12s
Default upstream DNS to Google and remove the mention of the environm… Check for merge conflicts #866: Commit a386d9b pushed by PromoFaux
June 30, 2024 20:14 9s v6/default-upstream
v6/default-upstream
June 30, 2024 20:14 9s
Merge pull request #1604 from pi-hole/dependabot/github_actions/devel… Check for merge conflicts #865: Commit c9a7c58 pushed by yubiuser
June 24, 2024 18:11 12s development-v6
development-v6
June 24, 2024 18:11 12s