Skip to content

Actions: pi-hole/pi-hole

Actions

Check for merge conflicts

Actions

Loading...

Show workflow options

Create status badge

merge-conflict.yml
1,135 workflow runs
1,135 workflow runs
Event

Filter by event
Status

Filter by status
Branch
Actor

Filter by actor
Bump pytest-testinfra from 10.1.0 to 10.1.1 in /test (#5672) Check for merge conflicts #1680: Commit 3cf538e pushed by yubiuser
June 1, 2024 11:02 2m 14s development
development
June 1, 2024 11:02 2m 14s
Development v6 Check for merge conflicts #1679: Pull request #5100 synchronize by yubiuser
June 1, 2024 11:01 9s
June 1, 2024 11:01 9s
Bump pytest-testinfra from 10.1.0 to 10.1.1 in /test (#5671) Check for merge conflicts #1678: Commit 159be01 pushed by yubiuser
June 1, 2024 11:01 2m 9s development-v6
development-v6
June 1, 2024 11:01 2m 9s
Development v6 Check for merge conflicts #1677: Pull request #5100 synchronize by yubiuser
June 1, 2024 11:00 15s
June 1, 2024 11:00 15s
Bump eps1lon/actions-label-merge-conflict from 3.0.1 to 3.0.2 (#5670) Check for merge conflicts #1676: Commit f6a3b02 pushed by yubiuser
June 1, 2024 11:00 2m 11s development-v6
development-v6
June 1, 2024 11:00 2m 11s
Bump pytest-testinfra from 10.1.0 to 10.1.1 in /test Check for merge conflicts #1675: Commit 36f05cb pushed by dependabot bot
June 1, 2024 10:29 11s dependabot/pip/test/development/pytest-testinfra-10.1.1
dependabot/pip/test/development/pytest-testinfra-10.1.1
June 1, 2024 10:29 11s
Bump pytest-testinfra from 10.1.0 to 10.1.1 in /test Check for merge conflicts #1674: Commit 628e1bb pushed by dependabot bot
June 1, 2024 10:22 17s dependabot/pip/test/development-v6/pytest-testinfra-10.1.1
dependabot/pip/test/development-v6/pytest-testinfra-10.1.1
June 1, 2024 10:22 17s
Bump eps1lon/actions-label-merge-conflict from 3.0.1 to 3.0.2 Check for merge conflicts #1673: Commit 4add164 pushed by dependabot bot
June 1, 2024 10:20 16s dependabot/github_actions/development-v6/eps1lon/actions-label-merge-conflict-3.0.2
dependabot/github_actions/development-v6/eps1lon/actions-label-merge-conflict-3.0.2
June 1, 2024 10:20 16s
Bump eps1lon/actions-label-merge-conflict from 3.0.1 to 3.0.2 (#5669) Check for merge conflicts #1672: Commit 78bd872 pushed by yubiuser
June 1, 2024 10:15 2m 13s development
development
June 1, 2024 10:15 2m 13s
Bump eps1lon/actions-label-merge-conflict from 3.0.1 to 3.0.2 Check for merge conflicts #1671: Commit 70376c2 pushed by dependabot bot
June 1, 2024 10:01 9s dependabot/github_actions/development/eps1lon/actions-label-merge-conflict-3.0.2
dependabot/github_actions/development/eps1lon/actions-label-merge-conflict-3.0.2
June 1, 2024 10:01 9s
Development v6 Check for merge conflicts #1670: Pull request #5100 synchronize by PromoFaux
May 27, 2024 22:04 2m 9s
May 27, 2024 22:04 2m 9s
Fix version check for release Docker images Check for merge conflicts #1669: Commit 7b19b65 pushed by PromoFaux
May 27, 2024 22:04 2m 14s development-v6
development-v6
May 27, 2024 22:04 2m 14s
Allow pihole checkout ftl ... in Docker containers Check for merge conflicts #1668: Commit 2d16ee9 pushed by DL6ER
May 27, 2024 14:36 13s tweak/docker_ftl_checkout
tweak/docker_ftl_checkout
May 27, 2024 14:36 13s
Bump pytest from 8.2.0 to 8.2.1 in /test (#5665) Check for merge conflicts #1667: Commit 741b9e1 pushed by yubiuser
May 25, 2024 19:54 2m 11s development
development
May 25, 2024 19:54 2m 11s
Development v6 Check for merge conflicts #1666: Pull request #5100 synchronize by yubiuser
May 25, 2024 19:50 13s
May 25, 2024 19:50 13s
Bump pytest from 8.2.0 to 8.2.1 in /test (#5666) Check for merge conflicts #1665: Commit 8a92486 pushed by yubiuser
May 25, 2024 19:50 2m 10s development-v6
development-v6
May 25, 2024 19:50 2m 10s
Bump pytest from 8.2.0 to 8.2.1 in /test Check for merge conflicts #1664: Pull request #5665 synchronize by yubiuser
May 25, 2024 19:49 13s
May 25, 2024 19:49 13s
Fix codespell Check for merge conflicts #1663: Commit d15beff pushed by yubiuser
May 25, 2024 19:49 12s dependabot/pip/test/development/pytest-8.2.1
dependabot/pip/test/development/pytest-8.2.1
May 25, 2024 19:49 12s
Bump pytest from 8.2.0 to 8.2.1 in /test Check for merge conflicts #1662: Commit d30a761 pushed by dependabot bot
May 25, 2024 11:02 9s dependabot/pip/test/development-v6/pytest-8.2.1
dependabot/pip/test/development-v6/pytest-8.2.1
May 25, 2024 11:02 9s
Bump pytest from 8.2.0 to 8.2.1 in /test Check for merge conflicts #1661: Commit 01e0c60 pushed by dependabot bot
May 25, 2024 10:38 12s dependabot/pip/test/development/pytest-8.2.1
dependabot/pip/test/development/pytest-8.2.1
May 25, 2024 10:38 12s
Development v6 Check for merge conflicts #1660: Pull request #5100 synchronize by yubiuser
May 22, 2024 19:34 13s
May 22, 2024 19:34 13s
Bump actions/checkout from 4.1.5 to 4.1.6 (#5662) Check for merge conflicts #1659: Commit 250a44c pushed by yubiuser
May 22, 2024 19:34 2m 10s development-v6
development-v6
May 22, 2024 19:34 2m 10s
Bump actions/checkout from 4.1.5 to 4.1.6 (#5661) Check for merge conflicts #1658: Commit dd64cf7 pushed by yubiuser
May 22, 2024 19:29 2m 13s development
development
May 22, 2024 19:29 2m 13s
Bump actions/checkout from 4.1.5 to 4.1.6 Check for merge conflicts #1657: Commit 5270336 pushed by dependabot bot
May 18, 2024 10:56 10s dependabot/github_actions/development-v6/actions/checkout-4.1.6
dependabot/github_actions/development-v6/actions/checkout-4.1.6
May 18, 2024 10:56 10s
Bump actions/checkout from 4.1.5 to 4.1.6 Check for merge conflicts #1656: Commit 443c5e8 pushed by dependabot bot
May 18, 2024 10:31 13s dependabot/github_actions/development/actions/checkout-4.1.6
dependabot/github_actions/development/actions/checkout-4.1.6
May 18, 2024 10:31 13s