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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Bump pytest from 8.1.1 to 8.1.2 in /test Check for merge conflicts #764: Commit 0d64bb5 pushed by dependabot bot
April 27, 2024 10:16 15s dependabot/pip/test/dev/pytest-8.1.2
dependabot/pip/test/dev/pytest-8.1.2
April 27, 2024 10:16 15s
Merge pull request #1569 from lemondjeff/development-v6-issue-1562-take2 Check for merge conflicts #763: Commit 9973fd9 pushed by PromoFaux
April 21, 2024 13:22 16s development-v6
development-v6
April 21, 2024 13:22 16s
Remove obsolete "version" value from example docker-compose.yml since… Check for merge conflicts #762: Pull request #1568 synchronize by lemondjeff
April 20, 2024 22:47 2m 10s
April 20, 2024 22:47 2m 10s
Remove obsolete "version" value from example docker-compose.yml since… Check for merge conflicts #761: Pull request #1568 synchronize by lemondjeff
April 20, 2024 22:47 2m 10s
April 20, 2024 22:47 2m 10s
Remove obsolete "version" value from example docker-compose.yml since… Check for merge conflicts #760: Pull request #1568 synchronize by lemondjeff
April 20, 2024 17:05 13s
April 20, 2024 17:05 13s
Merge pull request #1563 from lemondjeff/dev Check for merge conflicts #759: Commit 7e5ab40 pushed by PromoFaux
April 20, 2024 15:31 2m 12s dev
dev
April 20, 2024 15:31 2m 12s
Remove obsolete "version" value from example docker-compose.yml since… Check for merge conflicts #758: Pull request #1568 synchronize by lemondjeff
April 20, 2024 15:30 13s
April 20, 2024 15:30 13s
Remove obsolete "version" value from example docker-compose.yml since… Check for merge conflicts #757: Pull request #1568 synchronize by lemondjeff
April 20, 2024 15:26 9s
April 20, 2024 15:26 9s
Remove obsolete "version" value from example docker-compose.yml Check for merge conflicts #756: Pull request #1563 synchronize by lemondjeff
April 20, 2024 15:24 10s
April 20, 2024 15:24 10s
Remove obsolete "version" value from example docker-compose.yml Check for merge conflicts #755: Pull request #1563 synchronize by lemondjeff
April 19, 2024 23:18 11s
April 19, 2024 23:18 11s
Merge pull request #1554 from pi-hole/dependabot/pip/test/dev/pytest-… Check for merge conflicts #754: Commit 0fd3ae6 pushed by PromoFaux
April 18, 2024 18:56 2m 12s dev
dev
April 18, 2024 18:56 2m 12s
Bump pytest from 8.0.2 to 8.1.1 in /test Check for merge conflicts #753: Pull request #1554 synchronize by dependabot bot
April 18, 2024 18:54 13s
April 18, 2024 18:54 13s
Bump pytest from 8.0.2 to 8.1.1 in /test Check for merge conflicts #752: Commit 2783e38 pushed by dependabot bot
April 18, 2024 18:54 9s dependabot/pip/test/dev/pytest-8.1.1
dependabot/pip/test/dev/pytest-8.1.1
April 18, 2024 18:54 9s
Merge pull request #1558 from pi-hole/dependabot/github_actions/devel… Check for merge conflicts #751: Commit 897baa6 pushed by PromoFaux
April 18, 2024 18:53 12s development-v6
development-v6
April 18, 2024 18:53 12s
Bump eps1lon/actions-label-merge-conflict from 2.1.0 to 3.0.0 Check for merge conflicts #750: Pull request #1558 synchronize by dependabot bot
April 18, 2024 17:04 11s
April 18, 2024 17:04 11s
Bump eps1lon/actions-label-merge-conflict from 2.1.0 to 3.0.0 Check for merge conflicts #749: Commit 2cfebe2 pushed by dependabot bot
April 18, 2024 17:04 10s dependabot/github_actions/development-v6/eps1lon/actions-label-merge-conflict-3.0.0
dependabot/github_actions/development-v6/eps1lon/actions-label-merge-conflict-3.0.0
April 18, 2024 17:04 10s
Merge pull request #1557 from shamoon/patch-1 Check for merge conflicts #748: Commit 4d68ee6 pushed by PromoFaux
April 18, 2024 16:59 2m 12s development-v6
development-v6
April 18, 2024 16:59 2m 12s
Merge pull request #1566 from pi-hole/dependabot/pip/test/dev/black-2… Check for merge conflicts #747: Commit 13a04a7 pushed by PromoFaux
April 18, 2024 16:55 2m 14s dev
dev
April 18, 2024 16:55 2m 14s
Bump the pip group across 1 directory with 3 updates Check for merge conflicts #746: Commit daf1e56 pushed by dependabot bot
April 18, 2024 15:45 11s dependabot/pip/test/pip-150d523057
dependabot/pip/test/pip-150d523057
April 18, 2024 15:45 11s
Bump black from 24.2.0 to 24.4.0 in /test Check for merge conflicts #745: Commit e5e6a29 pushed by dependabot bot
April 13, 2024 10:22 9s dependabot/pip/test/dev/black-24.4.0
dependabot/pip/test/dev/black-24.4.0
April 13, 2024 10:22 9s
Bump the pip group across 1 directory with 3 updates Check for merge conflicts #744: Commit 4b1693b pushed by dependabot bot
April 12, 2024 04:48 11s dependabot/pip/test/pip-4a25ec9826
dependabot/pip/test/pip-4a25ec9826
April 12, 2024 04:48 11s
Merge pull request #1544 from pi-hole/dev Check for merge conflicts #743: Commit 91ff566 pushed by PromoFaux
March 31, 2024 18:48 14s 2024.03.2
2024.03.2
March 31, 2024 18:48 14s
Bump eps1lon/actions-label-merge-conflict from 2.1.0 to 3.0.0 Check for merge conflicts #742: Commit db20909 pushed by dependabot bot
March 30, 2024 10:36 10s dependabot/github_actions/dev/eps1lon/actions-label-merge-conflict-3.0.0
dependabot/github_actions/dev/eps1lon/actions-label-merge-conflict-3.0.0
March 30, 2024 10:36 10s
Bump eps1lon/actions-label-merge-conflict from 2.1.0 to 3.0.0 Check for merge conflicts #741: Commit 8b917e7 pushed by dependabot bot
March 30, 2024 10:35 11s dependabot/github_actions/development-v6/eps1lon/actions-label-merge-conflict-3.0.0
dependabot/github_actions/development-v6/eps1lon/actions-label-merge-conflict-3.0.0
March 30, 2024 10:35 11s
Merge pull request #1544 from pi-hole/dev Check for merge conflicts #740: Commit 91ff566 pushed by PromoFaux
March 27, 2024 19:49 11s 2024.03.1
2024.03.1
March 27, 2024 19:49 11s
ProTip! You can narrow down the results and go further in time using created:<2024-03-27 or the other filters available.