Skip to content

Actions: pi-hole/PADD

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflict.yml
319 workflow runs
319 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

vNext Check for merge conflicts #753: Pull request #484 synchronize by yubiuser
2m 7s
2m 7s
Bump actions/checkout from 6.0.1 to 6.0.2 (#497) Check for merge conflicts #752: Commit 6c7a734 pushed by yubiuser
2m 8s development
development
2m 8s
Bump actions/checkout from 6.0.1 to 6.0.2 Check for merge conflicts #751: Commit 7f31cef pushed by dependabot bot
12s dependabot/github_actions/development/actions/checkout-6.0.2
dependabot/github_actions/development/actions/checkout-6.0.2
12s
vNext Check for merge conflicts #750: Pull request #484 synchronize by yubiuser
6s
6s
Bump redhat-plumbers-in-action/differential-shellcheck from 5.5.5 to … Check for merge conflicts #749: Commit 86527ea pushed by yubiuser
2m 7s development
development
2m 7s
Bump redhat-plumbers-in-action/differential-shellcheck Check for merge conflicts #748: Commit 8cf6006 pushed by dependabot bot
9s dependabot/github_actions/development/redhat-plumbers-in-action/differential-shellcheck-5.5.6
dependabot/github_actions/development/redhat-plumbers-in-action/differential-shellcheck-5.5.6
9s
vNext Check for merge conflicts #747: Pull request #484 synchronize by yubiuser
9s
9s
Bump actions/stale from 10.1.0 to 10.1.1 (#493) Check for merge conflicts #746: Commit 5cd90df pushed by yubiuser
2m 7s development
development
2m 7s
vNext Check for merge conflicts #745: Pull request #484 synchronize by yubiuser
6s
6s
Bump actions/checkout from 6.0.0 to 6.0.1 (#492) Check for merge conflicts #744: Commit a2be00e pushed by yubiuser
2m 6s development
development
2m 6s
Bump actions/stale from 10.1.0 to 10.1.1 Check for merge conflicts #743: Commit c758d6e pushed by dependabot bot
10s dependabot/github_actions/development/actions/stale-10.1.1
dependabot/github_actions/development/actions/stale-10.1.1
10s
Bump actions/checkout from 6.0.0 to 6.0.1 Check for merge conflicts #742: Commit 4e40a0d pushed by dependabot bot
10s dependabot/github_actions/development/actions/checkout-6.0.1
dependabot/github_actions/development/actions/checkout-6.0.1
10s
vNext Check for merge conflicts #741: Pull request #484 synchronize by yubiuser
2m 7s
2m 7s
Bump actions/checkout from 5.0.0 to 6.0.0 (#490) Check for merge conflicts #740: Commit 3db460c pushed by yubiuser
2m 8s development
development
2m 8s
Bump actions/checkout from 5.0.0 to 6.0.0 Check for merge conflicts #739: Commit 292bfb7 pushed by dependabot bot
5s dependabot/github_actions/development/actions/checkout-6.0.0
dependabot/github_actions/development/actions/checkout-6.0.0
5s
vNext Check for merge conflicts #738: Pull request #484 synchronize by yubiuser
6s
6s
Bump codespell-project/actions-codespell from 2.1 to 2.2 (#486) Check for merge conflicts #737: Commit 9514fe0 pushed by yubiuser
2m 7s development
development
2m 7s
Bump codespell-project/actions-codespell from 2.1 to 2.2 Check for merge conflicts #736: Commit 38b3525 pushed by dependabot bot
6s dependabot/github_actions/development/codespell-project/actions-codespell-2.2
dependabot/github_actions/development/codespell-project/actions-codespell-2.2
6s
check for = false explicitly instead of != true Check for merge conflicts #735: Pull request #485 synchronize by mwoolweaver
7s
7s
PADD v4.1.0 (#438) Check for merge conflicts #734: Commit d8aa4f8 pushed by yubiuser
14s v4.1.0
v4.1.0
14s
Sync master back into development (#483) Check for merge conflicts #733: Commit e74f7f8 pushed by yubiuser
11s development
development
11s
PADD v4.1.0 (#438) Check for merge conflicts #732: Commit d8aa4f8 pushed by yubiuser
13s master
master
13s
PADD v4.1.0 Check for merge conflicts #731: Pull request #438 synchronize by yubiuser
12s
12s
Bump version to v4.1.0 (#482) Check for merge conflicts #730: Commit 9190f27 pushed by yubiuser
13s development
development
13s
PADD v4.1.0 Check for merge conflicts #729: Pull request #438 synchronize by yubiuser
12s
12s