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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #1983 from pi-hole/dependabot/github_actions/devel… Check for merge conflicts #1593: Commit b66f568 pushed by yubiuser
2m 8s development
development
2m 8s
Bump docker/login-action from 3.6.0 to 3.7.0 Check for merge conflicts #1592: Pull request #1983 synchronize by dependabot bot
6s
6s
Bump docker/login-action from 3.6.0 to 3.7.0 Check for merge conflicts #1591: Commit 44a9c64 pushed by dependabot bot
6s dependabot/github_actions/development/docker/login-action-3.7.0
dependabot/github_actions/development/docker/login-action-3.7.0
6s
Merge pull request #1982 from pi-hole/dependabot/docker/src/developme… Check for merge conflicts #1590: Commit b280c41 pushed by yubiuser
2m 7s development
development
2m 7s
Bump docker/login-action from 3.6.0 to 3.7.0 Check for merge conflicts #1589: Commit 942d37b pushed by dependabot bot
7s dependabot/github_actions/development/docker/login-action-3.7.0
dependabot/github_actions/development/docker/login-action-3.7.0
7s
Bump alpine from 3.23.2 to 3.23.3 in /src Check for merge conflicts #1588: Commit 9461b73 pushed by dependabot bot
7s dependabot/docker/src/development/alpine-3.23.3
dependabot/docker/src/development/alpine-3.23.3
7s
Merge pull request #1981 from pi-hole/dependabot/github_actions/devel… Check for merge conflicts #1587: Commit bcd9e46 pushed by yubiuser
2m 8s development
development
2m 8s
Bump actions/setup-python from 6.1.0 to 6.2.0 Check for merge conflicts #1586: Pull request #1981 synchronize by dependabot bot
7s
7s
Bump actions/setup-python from 6.1.0 to 6.2.0 Check for merge conflicts #1585: Commit 4db6189 pushed by dependabot bot
8s dependabot/github_actions/development/actions/setup-python-6.2.0
dependabot/github_actions/development/actions/setup-python-6.2.0
8s
Merge pull request #1980 from pi-hole/dependabot/github_actions/devel… Check for merge conflicts #1584: Commit aa8ebf1 pushed by yubiuser
2m 7s development
development
2m 7s
Fix python formatting for new black version Check for merge conflicts #1583: Commit 403178b pushed by yubiuser
12s dependabot/github_actions/development/actions/checkout-6.0.2
dependabot/github_actions/development/actions/checkout-6.0.2
12s
Bump actions/checkout from 6.0.1 to 6.0.2 Check for merge conflicts #1582: Pull request #1980 synchronize by yubiuser
8s
8s
Bump actions/checkout from 6.0.1 to 6.0.2 Check for merge conflicts #1581: Pull request #1980 synchronize by yubiuser
7s
7s
Fix python formatting for new black version Check for merge conflicts #1580: Commit 2d329ab pushed by yubiuser
6s dependabot/github_actions/development/actions/checkout-6.0.2
dependabot/github_actions/development/actions/checkout-6.0.2
6s
Bump actions/checkout from 6.0.1 to 6.0.2 Check for merge conflicts #1579: Pull request #1980 synchronize by yubiuser
6s
6s
Fix python formatting for new black version Check for merge conflicts #1578: Commit e4f7bd9 pushed by yubiuser
8s dependabot/github_actions/development/actions/checkout-6.0.2
dependabot/github_actions/development/actions/checkout-6.0.2
8s
Bump actions/checkout from 6.0.1 to 6.0.2 Check for merge conflicts #1577: Pull request #1980 synchronize by yubiuser
6s
6s
Fix python formatting for new black version Check for merge conflicts #1576: Commit c970d8c pushed by yubiuser
7s dependabot/github_actions/development/actions/checkout-6.0.2
dependabot/github_actions/development/actions/checkout-6.0.2
7s
Bump actions/setup-python from 6.1.0 to 6.2.0 Check for merge conflicts #1575: Commit 97d6b5b pushed by dependabot bot
35s dependabot/github_actions/development/actions/setup-python-6.2.0
dependabot/github_actions/development/actions/setup-python-6.2.0
35s
Bump actions/checkout from 6.0.1 to 6.0.2 Check for merge conflicts #1574: Commit 42c3d52 pushed by dependabot bot
6s dependabot/github_actions/development/actions/checkout-6.0.2
dependabot/github_actions/development/actions/checkout-6.0.2
6s
Merge pull request #1979 from pi-hole/dependabot/pip/test/development… Check for merge conflicts #1573: Commit 1018a49 pushed by yubiuser
2m 7s development
development
2m 7s
Bump tox from 4.33.0 to 4.34.1 in /test Check for merge conflicts #1572: Commit 068bf82 pushed by dependabot bot
5s dependabot/pip/test/development/tox-4.34.1
dependabot/pip/test/development/tox-4.34.1
5s
Merge pull request #1977 from pi-hole/dependabot/pip/test/development… Check for merge conflicts #1571: Commit 8b216d9 pushed by yubiuser
2m 9s development
development
2m 9s
Bump tox from 4.32.0 to 4.33.0 in /test Check for merge conflicts #1570: Commit 0afebcc pushed by dependabot bot
8s dependabot/pip/test/development/tox-4.33.0
dependabot/pip/test/development/tox-4.33.0
8s
Merge pull request #1974 from pi-hole/dependabot/github_actions/devel… Check for merge conflicts #1569: Commit e67a157 pushed by yubiuser
2m 6s development
development
2m 6s