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

Filter by Event

⌥ + click/return to exclude

Filter by Status

⌥ + click/return to exclude

Filter by Branch

⌥ + click/return to exclude

Filter by Actor

⌥ + click/return to exclude
refactor: replace eval with array in build.sh Check for merge conflicts #1693: Commit 1af69c7 pushed by PromoFaux
7s claude-review
claude-review
7s
Merge pull request #2011 from RynoCODE/master Check for merge conflicts #1692: Commit 2bc31ae pushed by PromoFaux
2m 7s development
development
2m 7s
Add timeout to curl command in branch validation Check for merge conflicts #1691: Pull request #2011 synchronize by PromoFaux
7s
7s
DOn't need the pip dependabot check anymorte Check for merge conflicts #1690: Commit e611c57 pushed by PromoFaux
2m 8s development
development
2m 8s
Merge pull request #2009 from pi-hole/use-bats Check for merge conflicts #1689: Commit 96affb1 pushed by PromoFaux
2m 11s development
development
2m 11s
Replace Python test suite with BATS and consolidate workflows Check for merge conflicts #1688: Pull request #2009 synchronize by PromoFaux
9s
9s
Further tweaks following review from @Copilot Check for merge conflicts #1687: Commit 2f6f07d pushed by PromoFaux
8s use-bats
use-bats
8s
Replace Python test suite with BATS and consolidate workflows Check for merge conflicts #1686: Pull request #2009 synchronize by PromoFaux
7s
7s
Further tweaks following review from @Copilot Check for merge conflicts #1685: Commit c3b72a4 pushed by PromoFaux
7s use-bats
use-bats
7s
Replace Python test suite with BATS and consolidate workflows Check for merge conflicts #1684: Pull request #2009 synchronize by PromoFaux
6s
6s
Further tweaks following review from @Copilot Check for merge conflicts #1683: Commit cf02b6b pushed by PromoFaux
7s use-bats
use-bats
7s
Replace Python test suite with BATS and consolidate workflows Check for merge conflicts #1682: Pull request #2009 synchronize by PromoFaux
7s
7s
Further tweaks following review from @Copilot Check for merge conflicts #1681: Commit 4ef100e pushed by PromoFaux
9s use-bats
use-bats
9s
Replace Python test suite with BATS and consolidate workflows Check for merge conflicts #1680: Pull request #2009 synchronize by PromoFaux
6s
6s
-p doesn't work in github actions runner... Check for merge conflicts #1679: Commit 11f2b7b pushed by PromoFaux
7s use-bats
use-bats
7s
Add timeout to curl command in branch validation Check for merge conflicts #1678: Pull request #2011 synchronize by RynoCODE
9s
9s
Merge pull request #2013 from pi-hole/dependabot/pip/test/development… Check for merge conflicts #1677: Commit f33e531 pushed by yubiuser
2m 7s development
development
2m 7s
Bump tox from 4.50.3 to 4.51.0 in /test Check for merge conflicts #1676: Pull request #2013 synchronize by dependabot Bot
6s
6s
Bump tox from 4.50.3 to 4.51.0 in /test Check for merge conflicts #1675: Commit f51beef pushed by dependabot Bot
7s dependabot/pip/test/development/tox-4.51.0
dependabot/pip/test/development/tox-4.51.0
7s
Merge pull request #2012 from pi-hole/dependabot/github_actions/devel… Check for merge conflicts #1674: Commit 1a52422 pushed by yubiuser
2m 6s development
development
2m 6s
Bump tox from 4.50.3 to 4.51.0 in /test Check for merge conflicts #1673: Commit e66ce1c pushed by dependabot Bot
21s dependabot/pip/test/development/tox-4.51.0
dependabot/pip/test/development/tox-4.51.0
21s
Bump editorconfig-checker/action-editorconfig-checker Check for merge conflicts #1672: Commit 933a82e pushed by dependabot Bot
6s dependabot/github_actions/development/editorconfig-checker/action-editorconfig-checker-2.2.0
dependabot/github_actions/development/editorconfig-checker/action-editorconfig-checker-2.2.0
6s
Add timeout to curl command in branch validation Check for merge conflicts #1671: Pull request #2011 synchronize by RynoCODE
8s
8s
Add timeout to curl command in branch validation Check for merge conflicts #1670: Pull request #2011 synchronize by RynoCODE
6s
6s
Merge pull request #2010 from pi-hole/dependabot/pip/test/development… Check for merge conflicts #1669: Commit f40963c pushed by yubiuser
2m 7s development
development
2m 7s