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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #1825 from pi-hole/development Check for merge conflicts #1196: Commit d06c0a6 pushed by PromoFaux
May 31, 2025 07:57 7s 2025.05.1
2025.05.1
May 31, 2025 07:57 7s
Merge pull request #1825 from pi-hole/development Check for merge conflicts #1195: Commit d06c0a6 pushed by PromoFaux
May 31, 2025 07:55 9s 2025.05.1
2025.05.1
May 31, 2025 07:55 9s
Merge pull request #1825 from pi-hole/development Check for merge conflicts #1194: Commit d06c0a6 pushed by PromoFaux
May 30, 2025 22:54 7s 2025.05.0
2025.05.0
May 30, 2025 22:54 7s
Bump pytest-xdist from 3.6.1 to 3.7.0 in /test Check for merge conflicts #1193: Commit 7ce5627 pushed by dependabot bot
May 30, 2025 22:50 8s dependabot/pip/test/development/pytest-xdist-3.7.0
dependabot/pip/test/development/pytest-xdist-3.7.0
May 30, 2025 22:50 8s
Merge pull request #1825 from pi-hole/development Check for merge conflicts #1192: Commit d06c0a6 pushed by PromoFaux
May 30, 2025 22:49 10s master
master
May 30, 2025 22:49 10s
spelling Check for merge conflicts #1191: Commit ad1288d pushed by PromoFaux
May 30, 2025 22:34 2m 7s development
development
May 30, 2025 22:34 2m 7s
Clarify warning on readme Check for merge conflicts #1190: Commit ac1b9dc pushed by PromoFaux
May 30, 2025 22:26 7s development
development
May 30, 2025 22:26 7s
Merge pull request #1823 from FreSchNDE/update-readme-web-port-info Check for merge conflicts #1189: Commit 21beb37 pushed by PromoFaux
May 30, 2025 22:24 4m 6s development
development
May 30, 2025 22:24 4m 6s
Remove RISCV builds for the time being Check for merge conflicts #1188: Commit 0f58605 pushed by PromoFaux
May 30, 2025 22:22 2m 9s development
development
May 30, 2025 22:22 2m 9s
Allow for building the image against a fork of the core/web/padd repo… Check for merge conflicts #1187: Commit 2a656e6 pushed by PromoFaux
May 30, 2025 22:13 2m 8s development
development
May 30, 2025 22:13 2m 8s
Allow for building the image against a fork of the core/web/padd repo… Check for merge conflicts #1186: Commit 2a656e6 pushed by PromoFaux
May 30, 2025 22:11 7s buildfork
buildfork
May 30, 2025 22:11 7s
Improve Tips section: clarify webserver port conflict handling Check for merge conflicts #1185: Pull request #1823 synchronize by FreSchNDE
May 30, 2025 14:47 8s
May 30, 2025 14:47 8s
Improve Tips section: clarify webserver port conflict handling Check for merge conflicts #1184: Pull request #1823 synchronize by FreSchNDE
May 28, 2025 16:56 7s
May 28, 2025 16:56 7s
Merge pull request #1820 from pi-hole/codeowner Check for merge conflicts #1183: Commit 28641b7 pushed by PromoFaux
May 6, 2025 16:47 2m 7s development
development
May 6, 2025 16:47 2m 7s
Use CODEOWNERS instead of deprecated dependbot/reviewers Check for merge conflicts #1182: Commit 5cb3b3a pushed by yubiuser
May 3, 2025 18:13 8s codeowner
codeowner
May 3, 2025 18:13 8s
Caps Check for merge conflicts #1181: Pull request #1814 synchronize by yubiuser
April 21, 2025 14:38 8s
April 21, 2025 14:38 8s
Apply reviewer's suggestions Check for merge conflicts #1180: Commit b9a2948 pushed by yubiuser
April 21, 2025 14:38 8s caps
caps
April 21, 2025 14:38 8s
Split check for return code and user Check for merge conflicts #1179: Commit cb9fe3d pushed by yubiuser
April 20, 2025 15:59 7s caps
caps
April 20, 2025 15:59 7s
Update local option in build script to compile FTL directly Check for merge conflicts #1178: Pull request #1809 synchronize by PromoFaux
April 5, 2025 11:21 8s
April 5, 2025 11:21 8s
Make the -l flag clone and build FTL directly inside the image, rat… Check for merge conflicts #1177: Commit ac7c190 pushed by PromoFaux
April 5, 2025 11:21 8s build-FTL
build-FTL
April 5, 2025 11:21 8s
Update local option in build script to compile FTL directly Check for merge conflicts #1176: Pull request #1809 synchronize by PromoFaux
April 5, 2025 11:21 9s
April 5, 2025 11:21 9s
Make the -l flag clone and build FTL directly inside the image, rat… Check for merge conflicts #1175: Commit 3e95ccd pushed by PromoFaux
April 5, 2025 11:21 9s build-FTL
build-FTL
April 5, 2025 11:21 9s
Update local option in build script to compile FTL directly Check for merge conflicts #1174: Pull request #1809 synchronize by PromoFaux
April 5, 2025 11:20 10s
April 5, 2025 11:20 10s
Update README.md Check for merge conflicts #1173: Commit 8506bd5 pushed by PromoFaux
April 5, 2025 11:20 10s build-FTL
build-FTL
April 5, 2025 11:20 10s
Make the -l flag clone and build FTL directly inside the image, rat… Check for merge conflicts #1172: Commit 6370cdd pushed by PromoFaux
April 5, 2025 11:16 8s build-FTL
build-FTL
April 5, 2025 11:16 8s