Skip to content

Actions: pi-hole/docker-pi-hole

Actions

Check for merge conflicts

Actions

Loading...

Show workflow options

Create status badge

merge-conflict.yml
685 workflow runs
685 workflow runs
Event

Filter by event
Status

Filter by status
Branch
Actor

Filter by actor
Yolo Check for merge conflicts #161: Commit 6f3fbc4 pushed by PromoFaux
June 19, 2023 21:06 45s v6-alpine-play
v6-alpine-play
June 19, 2023 21:06 45s
Yolo Check for merge conflicts #160: Commit f73feaa pushed by PromoFaux
June 19, 2023 21:05 31s v6-alpine-play
v6-alpine-play
June 19, 2023 21:05 31s
Yolo Check for merge conflicts #159: Commit 4c3641d pushed by PromoFaux
June 19, 2023 21:04 49m 1s v6-alpine-play
v6-alpine-play
June 19, 2023 21:04 49m 1s
Lets not overwite an existing image... Check for merge conflicts #158: Commit 05466f9 pushed by PromoFaux
June 19, 2023 20:40 13s v6-alpine-play
v6-alpine-play
June 19, 2023 20:40 13s
Add some arch detection into the dockerfile. Check for merge conflicts #157: Commit 452e0ca pushed by PromoFaux
June 19, 2023 20:39 27s v6-alpine-play
v6-alpine-play
June 19, 2023 20:39 27s
Fix typo wi1th to with Check for merge conflicts #156: Commit 7c48cd5 pushed by rdwebdesign
June 18, 2023 22:11 14s v6-alpine-play
v6-alpine-play
June 18, 2023 22:11 14s
switch to new development-v6 branch names Check for merge conflicts #155: Commit e10dd99 pushed by PromoFaux
June 18, 2023 21:33 13s v6-pre-alpha
v6-pre-alpha
June 18, 2023 21:33 13s
Add binutils as dependency used by the installer script to select the… Check for merge conflicts #154: Commit a076310 pushed by DL6ER
June 9, 2023 19:36 11s v6-pre-alpha
v6-pre-alpha
June 9, 2023 19:36 11s
Remove the s6 directory to prevent confusion. I will try to remember … Check for merge conflicts #153: Commit 171c810 pushed by PromoFaux
June 9, 2023 17:53 13s v6-alpine-play
v6-alpine-play
June 9, 2023 17:53 13s
Do not try to remove stale label on PRs Check for merge conflicts #152: Pull request #1356 synchronize by yubiuser
May 31, 2023 20:18 15s
May 31, 2023 20:18 15s
Merge pull request #1353 from pi-hole/dev Check for merge conflicts #151: Commit 37bd3d2 pushed by PromoFaux
May 30, 2023 18:49 13s 2023.05.2
2023.05.2
May 30, 2023 18:49 13s
Merge pull request #1353 from pi-hole/dev Check for merge conflicts #150: Commit 37bd3d2 pushed by PromoFaux
May 28, 2023 20:22 16s 2023.05.1
2023.05.1
May 28, 2023 20:22 16s
Merge pull request #1354 from pi-hole/master Check for merge conflicts #149: Commit 2ce9088 pushed by PromoFaux
May 28, 2023 11:47 41s dev
dev
May 28, 2023 11:47 41s
Merge pull request #1353 from pi-hole/dev Check for merge conflicts #148: Commit 37bd3d2 pushed by PromoFaux
May 28, 2023 11:42 9s 2023.05.0
2023.05.0
May 28, 2023 11:42 9s
Merge pull request #1353 from pi-hole/dev Check for merge conflicts #147: Commit 37bd3d2 pushed by PromoFaux
May 28, 2023 11:37 11s master
master
May 28, 2023 11:37 11s
Merge pull request #1319 from meonkeys/patch-1 Check for merge conflicts #146: Commit 2a4081f pushed by PromoFaux
May 28, 2023 11:36 13s dev
dev
May 28, 2023 11:36 13s
Merge pull request #1338 from pi-hole/add_new_web_themes Check for merge conflicts #145: Commit c470b10 pushed by PromoFaux
May 28, 2023 11:34 10s dev
dev
May 28, 2023 11:34 10s
Merge pull request #1339 from casperklein/cronjob Check for merge conflicts #144: Commit 78d2a08 pushed by PromoFaux
May 28, 2023 11:34 12s dev
dev
May 28, 2023 11:34 12s
Merge pull request #1340 from pi-hole/dependabot/github_actions/dev/a… Check for merge conflicts #143: Commit 625fd73 pushed by PromoFaux
May 28, 2023 11:32 2m 12s dev
dev
May 28, 2023 11:32 2m 12s
Merge pull request #1342 from laurentr/readme/available_themes Check for merge conflicts #142: Commit 26d409e pushed by PromoFaux
May 28, 2023 11:32 4m 14s dev
dev
May 28, 2023 11:32 4m 14s
Merge pull request #1352 from yubiuser/tweaks Check for merge conflicts #141: Commit d8e3dbc pushed by PromoFaux
May 28, 2023 11:32 4m 12s dev
dev
May 28, 2023 11:32 4m 12s
checkpoint Check for merge conflicts #140: Commit d7a2583 pushed by PromoFaux
May 12, 2023 19:00 11s v6-alpine-play
v6-alpine-play
May 12, 2023 19:00 11s
Tweak commands Check for merge conflicts #139: Pull request #1352 synchronize by yubiuser
May 11, 2023 21:09 10s
May 11, 2023 21:09 10s
Merge pull request #1350 from sebastianliebscher/image-size Check for merge conflicts #138: Commit 1f07552 pushed by PromoFaux
May 2, 2023 17:55 2m 12s dev
dev
May 2, 2023 17:55 2m 12s
shrink image size by ~10% Check for merge conflicts #137: Pull request #1350 synchronize by sebastianliebscher
May 2, 2023 17:15 15s
May 2, 2023 17:15 15s
ProTip! You can narrow down the results and go further in time using created:<2023-05-02 or the other filters available.