Skip to content

Actions: pi-hole/web

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflict.yml
1,371 workflow runs
1,371 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

build(deps-dev): bump autoprefixer from 10.4.22 to 10.4.23 (#3687) Check for merge conflicts #3573: Commit 3282e04 pushed by yubiuser
2m 6s development
development
2m 6s
build(deps): bump github/codeql-action from 4.31.8 to 4.31.9 (#3686) Check for merge conflicts #3572: Commit d75fa2f pushed by yubiuser
2m 6s development
development
2m 6s
build(deps-dev): bump autoprefixer from 10.4.22 to 10.4.23 Check for merge conflicts #3571: Commit 11e4c68 pushed by dependabot bot
24s dependabot/npm_and_yarn/development/autoprefixer-10.4.23
dependabot/npm_and_yarn/development/autoprefixer-10.4.23
24s
build(deps): bump github/codeql-action from 4.31.8 to 4.31.9 Check for merge conflicts #3570: Commit e69191b pushed by dependabot bot
24s dependabot/github_actions/development/github/codeql-action-4.31.9
dependabot/github_actions/development/github/codeql-action-4.31.9
24s
build(deps-dev): bump eslint from 9.39.1 to 9.39.2 (#3684) Check for merge conflicts #3569: Commit e6fa80f pushed by yubiuser
2m 8s development
development
2m 8s
build(deps): bump github/codeql-action from 4.31.7 to 4.31.8 (#3683) Check for merge conflicts #3568: Commit 4d387f5 pushed by yubiuser
2m 8s development
development
2m 8s
build(deps-dev): bump eslint from 9.39.1 to 9.39.2 Check for merge conflicts #3567: Commit bc4151b pushed by dependabot bot
36s dependabot/npm_and_yarn/development/eslint-9.39.2
dependabot/npm_and_yarn/development/eslint-9.39.2
36s
build(deps): bump github/codeql-action from 4.31.7 to 4.31.8 Check for merge conflicts #3566: Commit 8e7458d pushed by dependabot bot
33s dependabot/github_actions/development/github/codeql-action-4.31.8
dependabot/github_actions/development/github/codeql-action-4.31.8
33s
in network tab, decode and id "Private MAC" addresses Check for merge conflicts #3565: Pull request #3661 synchronize by rgetz
6s
6s
in network tab, decode and id "Private MAC" addresses Check for merge conflicts #3564: Pull request #3661 synchronize by rgetz
10s
10s
build(deps): bump actions/stale from 10.1.0 to 10.1.1 (#3682) Check for merge conflicts #3563: Commit 9c92d61 pushed by yubiuser
2m 8s development
development
2m 8s
build(deps): bump github/codeql-action from 4.31.5 to 4.31.7 (#3681) Check for merge conflicts #3562: Commit cbea15a pushed by yubiuser
2m 8s development
development
2m 8s
build(deps): bump actions/checkout from 6.0.0 to 6.0.1 (#3680) Check for merge conflicts #3561: Commit dfe8dfb pushed by yubiuser
2m 8s development
development
2m 8s
build(deps): bump actions/setup-node from 6.0.0 to 6.1.0 (#3679) Check for merge conflicts #3560: Commit 393a00f pushed by yubiuser
2m 9s development
development
2m 9s
build(deps-dev): bump prettier from 3.7.2 to 3.7.4 (#3678) Check for merge conflicts #3559: Commit 8735363 pushed by yubiuser
2m 7s development
development
2m 7s
build(deps): bump actions/stale from 10.1.0 to 10.1.1 Check for merge conflicts #3558: Commit 110fe8e pushed by dependabot bot
8s dependabot/github_actions/development/actions/stale-10.1.1
dependabot/github_actions/development/actions/stale-10.1.1
8s
build(deps): bump github/codeql-action from 4.31.5 to 4.31.7 Check for merge conflicts #3557: Commit 0a59513 pushed by dependabot bot
20s dependabot/github_actions/development/github/codeql-action-4.31.7
dependabot/github_actions/development/github/codeql-action-4.31.7
20s
build(deps): bump actions/checkout from 6.0.0 to 6.0.1 Check for merge conflicts #3556: Commit a856146 pushed by dependabot bot
7s dependabot/github_actions/development/actions/checkout-6.0.1
dependabot/github_actions/development/actions/checkout-6.0.1
7s
build(deps): bump actions/setup-node from 6.0.0 to 6.1.0 Check for merge conflicts #3555: Commit b483d3d pushed by dependabot bot
7s dependabot/github_actions/development/actions/setup-node-6.1.0
dependabot/github_actions/development/actions/setup-node-6.1.0
7s
build(deps-dev): bump prettier from 3.7.2 to 3.7.4 Check for merge conflicts #3554: Commit 0b7cea4 pushed by dependabot bot
7s dependabot/npm_and_yarn/development/prettier-3.7.4
dependabot/npm_and_yarn/development/prettier-3.7.4
7s
build(deps-dev): bump prettier from 3.6.2 to 3.7.2 (#3674) Check for merge conflicts #3553: Commit 9777f9c pushed by yubiuser
2m 8s development
development
2m 8s
build(deps-dev): bump prettier from 3.6.2 to 3.7.2 Check for merge conflicts #3552: Pull request #3674 synchronize by yubiuser
10s
10s
Fix css style Check for merge conflicts #3551: Commit 5299221 pushed by yubiuser
9s dependabot/npm_and_yarn/development/prettier-3.7.2
dependabot/npm_and_yarn/development/prettier-3.7.2
9s
build(deps-dev): bump prettier from 3.6.2 to 3.7.2 Check for merge conflicts #3550: Pull request #3674 synchronize by yubiuser
9s
9s
Fix css style Check for merge conflicts #3549: Commit 967b770 pushed by yubiuser
8s dependabot/npm_and_yarn/development/prettier-3.7.2
dependabot/npm_and_yarn/development/prettier-3.7.2
8s