Skip to content

Actions: pi-hole/docs

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #919 from pi-hole/dependabot/pip/mkdocs-material-9… Check for merge conflicts #388: Commit 0e14a7b pushed by yubiuser
September 2, 2023 16:22 2m 14s master
master
September 2, 2023 16:22 2m 14s
Bump mkdocs-material from 9.2.3 to 9.2.6 Check for merge conflicts #387: Commit 26395f5 pushed by dependabot bot
September 2, 2023 10:33 13s dependabot/pip/mkdocs-material-9.2.6
dependabot/pip/mkdocs-material-9.2.6
September 2, 2023 10:33 13s
Merge pull request #918 from pi-hole/dependabot/github_actions/action… Check for merge conflicts #386: Commit 29246ea pushed by yubiuser
August 26, 2023 12:46 2m 13s master
master
August 26, 2023 12:46 2m 13s
Bump actions/checkout from 3.5.3 to 3.6.0 Check for merge conflicts #385: Pull request #918 synchronize by dependabot bot
August 26, 2023 12:45 14s
August 26, 2023 12:45 14s
Bump actions/checkout from 3.5.3 to 3.6.0 Check for merge conflicts #384: Commit 66dcba4 pushed by dependabot bot
August 26, 2023 12:44 10s dependabot/github_actions/actions/checkout-3.6.0
dependabot/github_actions/actions/checkout-3.6.0
August 26, 2023 12:44 10s
Merge pull request #915 from pi-hole/dependabot/npm_and_yarn/linkinat… Check for merge conflicts #383: Commit 191517d pushed by yubiuser
August 26, 2023 12:42 2m 11s master
master
August 26, 2023 12:42 2m 11s
Bump linkinator from 5.0.1 to 5.0.2 Check for merge conflicts #382: Pull request #915 synchronize by dependabot bot
August 26, 2023 12:41 12s
August 26, 2023 12:41 12s
Bump linkinator from 5.0.1 to 5.0.2 Check for merge conflicts #381: Commit af91c80 pushed by dependabot bot
August 26, 2023 12:41 13s dependabot/npm_and_yarn/linkinator-5.0.2
dependabot/npm_and_yarn/linkinator-5.0.2
August 26, 2023 12:41 13s
Merge pull request #917 from pi-hole/dependabot/pip/mkdocs-material-9… Check for merge conflicts #380: Commit 149ccb0 pushed by yubiuser
August 26, 2023 11:23 2m 11s master
master
August 26, 2023 11:23 2m 11s
Bump mkdocs-material from 9.1.21 to 9.2.3 Check for merge conflicts #379: Pull request #917 synchronize by dependabot bot
August 26, 2023 11:22 10s
August 26, 2023 11:22 10s
Bump mkdocs-material from 9.1.21 to 9.2.3 Check for merge conflicts #378: Commit e17dd1f pushed by dependabot bot
August 26, 2023 11:22 11s dependabot/pip/mkdocs-material-9.2.3
dependabot/pip/mkdocs-material-9.2.3
August 26, 2023 11:22 11s
Bump linkinator from 5.0.1 to 5.0.2 Check for merge conflicts #377: Pull request #915 synchronize by dependabot bot
August 26, 2023 11:15 10s
August 26, 2023 11:15 10s
Bump linkinator from 5.0.1 to 5.0.2 Check for merge conflicts #376: Commit 3adc599 pushed by dependabot bot
August 26, 2023 11:15 11s dependabot/npm_and_yarn/linkinator-5.0.2
dependabot/npm_and_yarn/linkinator-5.0.2
August 26, 2023 11:15 11s
Merge pull request #916 from pi-hole/dependabot/npm_and_yarn/markdown… Check for merge conflicts #375: Commit 9fcc675 pushed by yubiuser
August 26, 2023 11:14 2m 11s master
master
August 26, 2023 11:14 2m 11s
Bump actions/checkout from 3.5.3 to 3.6.0 Check for merge conflicts #374: Commit 5c799f3 pushed by dependabot bot
August 26, 2023 10:53 11s dependabot/github_actions/actions/checkout-3.6.0
dependabot/github_actions/actions/checkout-3.6.0
August 26, 2023 10:53 11s
Bump mkdocs-material from 9.1.21 to 9.2.3 Check for merge conflicts #373: Commit b9ab799 pushed by dependabot bot
August 26, 2023 10:42 10s dependabot/pip/mkdocs-material-9.2.3
dependabot/pip/mkdocs-material-9.2.3
August 26, 2023 10:42 10s
Bump markdownlint-cli2 from 0.8.1 to 0.9.2 Check for merge conflicts #372: Commit a25c71f pushed by dependabot bot
August 26, 2023 10:11 12s dependabot/npm_and_yarn/markdownlint-cli2-0.9.2
dependabot/npm_and_yarn/markdownlint-cli2-0.9.2
August 26, 2023 10:11 12s
Bump linkinator from 5.0.1 to 5.0.2 Check for merge conflicts #371: Commit 4328dff pushed by dependabot bot
August 26, 2023 10:11 12s dependabot/npm_and_yarn/linkinator-5.0.2
dependabot/npm_and_yarn/linkinator-5.0.2
August 26, 2023 10:11 12s
Remove >domain from Telnet API Check for merge conflicts #370: Commit 604ccd1 pushed by yubiuser
August 26, 2023 07:26 12s no_domain
no_domain
August 26, 2023 07:26 12s
Run dependabot on v6 branch Check for merge conflicts #369: Pull request #907 synchronize by yubiuser
August 26, 2023 07:24 10s
August 26, 2023 07:24 10s
Run dependabot on v6 branch Check for merge conflicts #368: Commit c0c514b pushed by yubiuser
August 26, 2023 07:24 11s dependbot_v6
dependbot_v6
August 26, 2023 07:24 11s
Merge pull request #912 from pi-hole/dependabot/github_actions/action… Check for merge conflicts #367: Commit 9682106 pushed by yubiuser
August 19, 2023 14:09 2m 14s master
master
August 19, 2023 14:09 2m 14s
Bump actions/setup-node from 3.7.0 to 3.8.1 Check for merge conflicts #366: Commit e1e4e12 pushed by dependabot bot
August 19, 2023 10:37 11s dependabot/github_actions/actions/setup-node-3.8.1
dependabot/github_actions/actions/setup-node-3.8.1
August 19, 2023 10:37 11s
Run dependabot on v6 branch Check for merge conflicts #365: Pull request #907 synchronize by yubiuser
August 13, 2023 20:05 15s
August 13, 2023 20:05 15s
Run dependabot on v6 branch Check for merge conflicts #364: Commit c7142ee pushed by yubiuser
August 13, 2023 20:05 10s dependbot_v6
dependbot_v6
August 13, 2023 20:05 10s
ProTip! You can narrow down the results and go further in time using created:<2023-08-13 or the other filters available.