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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #1731 from pi-hole/development Check for merge conflicts #1113: Commit 29b604a pushed by PromoFaux
February 21, 2025 22:13 10s 2025.02.4
2025.02.4
February 21, 2025 22:13 10s
Merge pull request #1731 from pi-hole/development Check for merge conflicts #1112: Commit 29b604a pushed by PromoFaux
February 21, 2025 01:58 10s 2025.02.3
2025.02.3
February 21, 2025 01:58 10s
Merge pull request #1732 from pi-hole/master Check for merge conflicts #1111: Commit 70d8e10 pushed by PromoFaux
February 21, 2025 01:57 2m 9s development
development
February 21, 2025 01:57 2m 9s
Merge pull request #1731 from pi-hole/development Check for merge conflicts #1110: Commit 29b604a pushed by PromoFaux
February 21, 2025 01:57 2m 13s master
master
February 21, 2025 01:57 2m 13s
Merge pull request #1730 from pi-hole/expose Check for merge conflicts #1109: Commit 08997a9 pushed by PromoFaux
February 21, 2025 01:56 2m 11s development
development
February 21, 2025 01:56 2m 11s
Re-expose ports 53/67/80/443 Check for merge conflicts #1108: Pull request #1730 synchronize by PromoFaux
February 21, 2025 01:55 13s
February 21, 2025 01:55 13s
Re-expose ports 53/67/80/443 Check for merge conflicts #1107: Commit cbe32d6 pushed by PromoFaux
February 21, 2025 01:55 11s expose
expose
February 21, 2025 01:55 11s
Re-expose ports 53/67/80/443 Check for merge conflicts #1106: Commit c3c1084 pushed by PromoFaux
February 21, 2025 01:54 13s expose
expose
February 21, 2025 01:54 13s
Merge pull request #1702 from pi-hole/master Check for merge conflicts #1105: Commit fb590f0 pushed by PromoFaux
February 20, 2025 23:22 2m 9s development
development
February 20, 2025 23:22 2m 9s
Sync master back into development Check for merge conflicts #1104: Pull request #1702 synchronize by PromoFaux
February 20, 2025 23:22 2m 11s
February 20, 2025 23:22 2m 11s
Improve default docker compose file to inclide SYS_TIME and SYS_NICE Check for merge conflicts #1103: Commit 49215d7 pushed by PromoFaux
February 20, 2025 23:22 2m 9s master
master
February 20, 2025 23:22 2m 9s
Merge pull request #1727 from pi-hole/caps Check for merge conflicts #1102: Commit bfe28b3 pushed by PromoFaux
February 20, 2025 23:13 15s 2025.02.2
2025.02.2
February 20, 2025 23:13 15s
Sync master back into development Check for merge conflicts #1101: Pull request #1702 synchronize by PromoFaux
February 20, 2025 21:59 12s
February 20, 2025 21:59 12s
Merge pull request #1727 from pi-hole/caps Check for merge conflicts #1100: Commit bfe28b3 pushed by PromoFaux
February 20, 2025 21:59 2m 10s master
master
February 20, 2025 21:59 2m 10s
Sync master back into development Check for merge conflicts #1099: Pull request #1702 synchronize by PromoFaux
February 20, 2025 21:57 10s
February 20, 2025 21:57 10s
Merge pull request #1720 from pi-hole/padd Check for merge conflicts #1098: Commit a7e8d82 pushed by PromoFaux
February 20, 2025 21:57 2m 10s master
master
February 20, 2025 21:57 2m 10s
Sync master back into development Check for merge conflicts #1097: Pull request #1702 synchronize by PromoFaux
February 20, 2025 21:56 12s
February 20, 2025 21:56 12s
Merge pull request #1719 from pi-hole/dnsmasq Check for merge conflicts #1096: Commit 26913f3 pushed by PromoFaux
February 20, 2025 21:56 2m 10s master
master
February 20, 2025 21:56 2m 10s
Improve default docker compose file to inclide SYS_TIME and SYS_NICE Check for merge conflicts #1095: Commit 04ad940 pushed by yubiuser
February 20, 2025 21:49 14s caps
caps
February 20, 2025 21:49 14s
Amend README to include PADD branch in custom build steps Check for merge conflicts #1094: Commit 0c7cbb1 pushed by yubiuser
February 20, 2025 10:19 11s padd
padd
February 20, 2025 10:19 11s
Add note about FTLCONF_misc_etc_dnsmasq_d Check for merge conflicts #1093: Pull request #1719 synchronize by yubiuser
February 20, 2025 09:30 17s
February 20, 2025 09:30 17s
Add note about FTLCONF_misc_etc_dnsmasq_d Check for merge conflicts #1092: Commit 9f11da6 pushed by yubiuser
February 20, 2025 09:30 11s dnsmasq
dnsmasq
February 20, 2025 09:30 11s
Add note about FTLCONF_misc_etc_dnsmasq_d Check for merge conflicts #1091: Commit 2d34c2b pushed by yubiuser
February 20, 2025 09:26 11s dnsmasq
dnsmasq
February 20, 2025 09:26 11s
Update README.md Check for merge conflicts #1090: Commit 66b79aa pushed by PromoFaux
February 19, 2025 00:53 2m 14s master
master
February 19, 2025 00:53 2m 14s
Merge pull request #1700 from pi-hole/test/FTLvv Check for merge conflicts #1089: Commit 58fcd1f pushed by PromoFaux
February 18, 2025 23:10 2m 10s development
development
February 18, 2025 23:10 2m 10s