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
666 workflow runs
666 workflow runs
Event

Filter by event
Status

Filter by status
Branch
Actor

Filter by actor
Merge pull request #1579 from pi-hole/dependabot/github_actions/devel… Check for merge conflicts #789: Commit 6657818 pushed by yubiuser
May 11, 2024 12:30 10s development-v6
development-v6
May 11, 2024 12:30 10s
Merge pull request #1580 from pi-hole/dependabot/github_actions/dev/e… Check for merge conflicts #788: Commit 8eb20a7 pushed by yubiuser
May 11, 2024 12:27 2m 18s dev
dev
May 11, 2024 12:27 2m 18s
Bump eps1lon/actions-label-merge-conflict from 3.0.0 to 3.0.1 Check for merge conflicts #787: Commit c17f6bf pushed by dependabot bot
May 11, 2024 10:27 10s dependabot/github_actions/dev/eps1lon/actions-label-merge-conflict-3.0.1
dependabot/github_actions/dev/eps1lon/actions-label-merge-conflict-3.0.1
May 11, 2024 10:27 10s
Bump eps1lon/actions-label-merge-conflict from 3.0.0 to 3.0.1 Check for merge conflicts #786: Commit 05c305b pushed by dependabot bot
May 11, 2024 10:18 10s dependabot/github_actions/development-v6/eps1lon/actions-label-merge-conflict-3.0.1
dependabot/github_actions/development-v6/eps1lon/actions-label-merge-conflict-3.0.1
May 11, 2024 10:18 10s
Merge pull request #1576 from pi-hole/fix/grep-version Check for merge conflicts #785: Commit d2e46f3 pushed by PromoFaux
May 9, 2024 07:43 12s development-v6
development-v6
May 9, 2024 07:43 12s
Install grep to avoid issues in pihole -w/b with the default busybox … Check for merge conflicts #784: Pull request #1576 synchronize by PromoFaux
May 8, 2024 21:27 10s
May 8, 2024 21:27 10s
Install grep to avoid issues in pihole -w/b with the default busybox … Check for merge conflicts #783: Commit a49600e pushed by PromoFaux
May 8, 2024 21:27 11s fix/grep-version
fix/grep-version
May 8, 2024 21:27 11s
Install grep to avoid issues in pihole -w/b with the default busybox … Check for merge conflicts #782: Pull request #1576 synchronize by PromoFaux
May 8, 2024 21:21 12s
May 8, 2024 21:21 12s
Install grep to avoid issues in pihole -w/b with the default busybox … Check for merge conflicts #781: Commit fd1881e pushed by PromoFaux
May 8, 2024 21:21 12s fix/grep-version
fix/grep-version
May 8, 2024 21:21 12s
Install grep to avoid issues in pihole -w/b with the default busybox … Check for merge conflicts #780: Commit d0dddcf pushed by PromoFaux
May 8, 2024 20:50 11s fix/grep-version
fix/grep-version
May 8, 2024 20:50 11s
Merge pull request #1567 from pi-hole/dependabot/pip/test/pip-150d523057 Check for merge conflicts #779: Commit c2887ae pushed by PromoFaux
May 8, 2024 20:05 12s 2024.05.0
2024.05.0
May 8, 2024 20:05 12s
Merge pull request #1575 from pi-hole/dependabot/pip/test/dev/pytest-… Check for merge conflicts #778: Commit 7253da1 pushed by yubiuser
May 4, 2024 11:11 2m 11s dev
dev
May 4, 2024 11:11 2m 11s
Bump pytest from 8.1.2 to 8.2.0 in /test Check for merge conflicts #777: Pull request #1575 synchronize by dependabot bot
May 4, 2024 10:58 12s
May 4, 2024 10:58 12s
Bump pytest from 8.1.2 to 8.2.0 in /test Check for merge conflicts #776: Commit 51f1261 pushed by dependabot bot
May 4, 2024 10:58 9s dependabot/pip/test/dev/pytest-8.2.0
dependabot/pip/test/dev/pytest-8.2.0
May 4, 2024 10:58 9s
Merge pull request #1574 from pi-hole/dependabot/pip/test/dev/pytest-… Check for merge conflicts #775: Commit 2ad8905 pushed by yubiuser
May 4, 2024 10:57 2m 9s dev
dev
May 4, 2024 10:57 2m 9s
Bump pytest from 8.1.2 to 8.2.0 in /test Check for merge conflicts #774: Commit cf01252 pushed by dependabot bot
May 4, 2024 10:33 10s dependabot/pip/test/dev/pytest-8.2.0
dependabot/pip/test/dev/pytest-8.2.0
May 4, 2024 10:33 10s
Bump pytest-xdist from 3.5.0 to 3.6.1 in /test Check for merge conflicts #773: Commit 6990b09 pushed by dependabot bot
May 4, 2024 10:32 10s dependabot/pip/test/dev/pytest-xdist-3.6.1
dependabot/pip/test/dev/pytest-xdist-3.6.1
May 4, 2024 10:32 10s
Merge pull request #1559 from pi-hole/dependabot/github_actions/dev/e… Check for merge conflicts #772: Commit a0a2430 pushed by PromoFaux
April 28, 2024 14:36 16s dev
dev
April 28, 2024 14:36 16s
Merge pull request #1556 from pi-hole/dependabot/github_actions/dev/C… Check for merge conflicts #771: Commit 007dc80 pushed by PromoFaux
April 28, 2024 14:36 12s dev
dev
April 28, 2024 14:36 12s
Merge pull request #1567 from pi-hole/dependabot/pip/test/pip-150d523057 Check for merge conflicts #770: Commit c2887ae pushed by PromoFaux
April 28, 2024 14:36 13s master
master
April 28, 2024 14:36 13s
Merge pull request #1572 from pi-hole/dependabot/pip/test/dev/black-2… Check for merge conflicts #769: Commit 4b9a8ca pushed by yubiuser
April 27, 2024 10:52 2m 9s dev
dev
April 27, 2024 10:52 2m 9s
Bump black from 24.4.0 to 24.4.2 in /test Check for merge conflicts #768: Pull request #1572 synchronize by dependabot bot
April 27, 2024 10:50 10s
April 27, 2024 10:50 10s
Bump black from 24.4.0 to 24.4.2 in /test Check for merge conflicts #767: Commit 94cb08a pushed by dependabot bot
April 27, 2024 10:50 13s dependabot/pip/test/dev/black-24.4.2
dependabot/pip/test/dev/black-24.4.2
April 27, 2024 10:50 13s
Merge pull request #1571 from pi-hole/dependabot/pip/test/dev/pytest-… Check for merge conflicts #766: Commit 0b0db71 pushed by yubiuser
April 27, 2024 10:49 2m 9s dev
dev
April 27, 2024 10:49 2m 9s
Bump black from 24.4.0 to 24.4.2 in /test Check for merge conflicts #765: Commit 056002f pushed by dependabot bot
April 27, 2024 10:16 9s dependabot/pip/test/dev/black-24.4.2
dependabot/pip/test/dev/black-24.4.2
April 27, 2024 10:16 9s