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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Pi-hole v6.0 documentation Check for merge conflicts #1068: Pull request #338 synchronize by yubiuser
October 19, 2024 10:59 9s
October 19, 2024 10:59 9s
Merge pull request #1120 from pi-hole/dependabot/pip/release/v6.0/pip… Check for merge conflicts #1067: Commit 020c777 pushed by yubiuser
October 19, 2024 10:59 2m 10s release/v6.0
release/v6.0
October 19, 2024 10:59 2m 10s
Bump mkdocs-material from 9.5.40 to 9.5.41 in the pip-dependencies group Check for merge conflicts #1066: Commit d14f2cc pushed by dependabot bot
October 19, 2024 10:42 10s dependabot/pip/release/v6.0/pip-dependencies-d5cb191d72
dependabot/pip/release/v6.0/pip-dependencies-d5cb191d72
October 19, 2024 10:42 10s
Merge pull request #1119 from pi-hole/dependabot/pip/master/pip-depen… Check for merge conflicts #1065: Commit 3efdb5c pushed by yubiuser
October 19, 2024 10:33 2m 17s master
master
October 19, 2024 10:33 2m 17s
Bump mkdocs-material from 9.5.40 to 9.5.41 in the pip-dependencies group Check for merge conflicts #1064: Commit a8bed10 pushed by dependabot bot
October 19, 2024 10:10 10s dependabot/pip/master/pip-dependencies-d5cb191d72
dependabot/pip/master/pip-dependencies-d5cb191d72
October 19, 2024 10:10 10s
Merge pull request #1117 from pi-hole/dependabot/pip/master/pip-depen… Check for merge conflicts #1063: Commit 11d241d pushed by yubiuser
October 12, 2024 14:17 2m 15s master
master
October 12, 2024 14:17 2m 15s
Pi-hole v6.0 documentation Check for merge conflicts #1062: Pull request #338 synchronize by yubiuser
October 12, 2024 14:16 10s
October 12, 2024 14:16 10s
Merge pull request #1116 from pi-hole/dependabot/npm_and_yarn/release… Check for merge conflicts #1061: Commit 4aa3822 pushed by yubiuser
October 12, 2024 14:16 2m 9s release/v6.0
release/v6.0
October 12, 2024 14:16 2m 9s
Pi-hole v6.0 documentation Check for merge conflicts #1060: Pull request #338 synchronize by yubiuser
October 12, 2024 14:15 11s
October 12, 2024 14:15 11s
Merge pull request #1115 from pi-hole/dependabot/github_actions/relea… Check for merge conflicts #1059: Commit 20147b1 pushed by yubiuser
October 12, 2024 14:15 13s release/v6.0
release/v6.0
October 12, 2024 14:15 13s
Bump mkdocs-material from 9.5.39 to 9.5.40 in the pip-dependencies group Check for merge conflicts #1058: Pull request #1117 synchronize by dependabot bot
October 12, 2024 14:15 2m 9s
October 12, 2024 14:15 2m 9s
Bump mkdocs-material from 9.5.39 to 9.5.40 in the pip-dependencies group Check for merge conflicts #1057: Commit b69b4c6 pushed by dependabot bot
October 12, 2024 14:15 13s dependabot/pip/master/pip-dependencies-2fa875aea2
dependabot/pip/master/pip-dependencies-2fa875aea2
October 12, 2024 14:15 13s
Pi-hole v6.0 documentation Check for merge conflicts #1056: Pull request #338 synchronize by yubiuser
October 12, 2024 14:14 2m 9s
October 12, 2024 14:14 2m 9s
Merge pull request #1114 from pi-hole/dependabot/pip/release/v6.0/pip… Check for merge conflicts #1055: Commit c6a966c pushed by yubiuser
October 12, 2024 14:14 2m 11s release/v6.0
release/v6.0
October 12, 2024 14:14 2m 11s
Merge pull request #1113 from pi-hole/dependabot/npm_and_yarn/master/… Check for merge conflicts #1054: Commit 471414c pushed by yubiuser
October 12, 2024 12:40 2m 10s master
master
October 12, 2024 12:40 2m 10s
Bump linkinator from 6.1.1 to 6.1.2 in the npm-dependencies group Check for merge conflicts #1053: Pull request #1113 synchronize by dependabot bot
October 12, 2024 12:39 9s
October 12, 2024 12:39 9s
Bump linkinator from 6.1.1 to 6.1.2 in the npm-dependencies group Check for merge conflicts #1052: Commit 4090db4 pushed by dependabot bot
October 12, 2024 12:39 8s dependabot/npm_and_yarn/master/npm-dependencies-d83d990322
dependabot/npm_and_yarn/master/npm-dependencies-d83d990322
October 12, 2024 12:39 8s
Merge pull request #1112 from pi-hole/dependabot/github_actions/maste… Check for merge conflicts #1051: Commit f3427d0 pushed by yubiuser
October 12, 2024 12:38 2m 12s master
master
October 12, 2024 12:38 2m 12s
Bump mkdocs-material from 9.5.39 to 9.5.40 in the pip-dependencies group Check for merge conflicts #1050: Commit 34720ec pushed by dependabot bot
October 12, 2024 10:50 9s dependabot/pip/master/pip-dependencies-2fa875aea2
dependabot/pip/master/pip-dependencies-2fa875aea2
October 12, 2024 10:50 9s
Bump linkinator from 6.1.1 to 6.1.2 in the npm-dependencies group Check for merge conflicts #1049: Commit d04d4bc pushed by dependabot bot
October 12, 2024 10:50 13s dependabot/npm_and_yarn/release/v6.0/npm-dependencies-d83d990322
dependabot/npm_and_yarn/release/v6.0/npm-dependencies-d83d990322
October 12, 2024 10:50 13s
Bump actions/checkout in the github_action-dependencies group Check for merge conflicts #1048: Commit 36915de pushed by dependabot bot
October 12, 2024 10:25 11s dependabot/github_actions/release/v6.0/github_action-dependencies-a9bb80ae19
dependabot/github_actions/release/v6.0/github_action-dependencies-a9bb80ae19
October 12, 2024 10:25 11s
Bump mkdocs-material from 9.5.39 to 9.5.40 in the pip-dependencies group Check for merge conflicts #1047: Commit 86ae7a3 pushed by dependabot bot
October 12, 2024 10:16 10s dependabot/pip/release/v6.0/pip-dependencies-2fa875aea2
dependabot/pip/release/v6.0/pip-dependencies-2fa875aea2
October 12, 2024 10:16 10s
Bump linkinator from 6.1.1 to 6.1.2 in the npm-dependencies group Check for merge conflicts #1046: Commit 43fbd64 pushed by dependabot bot
October 12, 2024 10:14 10s dependabot/npm_and_yarn/master/npm-dependencies-d83d990322
dependabot/npm_and_yarn/master/npm-dependencies-d83d990322
October 12, 2024 10:14 10s
Bump actions/checkout in the github_action-dependencies group Check for merge conflicts #1045: Commit f202454 pushed by dependabot bot
October 12, 2024 10:05 10s dependabot/github_actions/master/github_action-dependencies-a9bb80ae19
dependabot/github_actions/master/github_action-dependencies-a9bb80ae19
October 12, 2024 10:05 10s
Update docs to remove/replace outdated references Check for merge conflicts #1044: Pull request #1099 synchronize by PromoFaux
October 6, 2024 12:02 10s
October 6, 2024 12:02 10s