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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Pi-hole v6.0 documentation Check for merge conflicts #1215: Pull request #338 synchronize by yubiuser
January 26, 2025 07:44 11s
January 26, 2025 07:44 11s
Merge pull request #1159 from pi-hole/dependabot/github_actions/relea… Check for merge conflicts #1214: Commit 214ef0e pushed by yubiuser
January 26, 2025 07:44 2m 11s release/v6.0
release/v6.0
January 26, 2025 07:44 2m 11s
Bump actions/stale in the github_action-dependencies group Check for merge conflicts #1213: Commit bd8ca14 pushed by dependabot bot
January 25, 2025 10:17 13s dependabot/github_actions/master/github_action-dependencies-637f40baaf
dependabot/github_actions/master/github_action-dependencies-637f40baaf
January 25, 2025 10:17 13s
Bump actions/stale in the github_action-dependencies group Check for merge conflicts #1212: Commit a2d7943 pushed by dependabot bot
January 25, 2025 10:08 9s dependabot/github_actions/release/v6.0/github_action-dependencies-637f40baaf
dependabot/github_actions/release/v6.0/github_action-dependencies-637f40baaf
January 25, 2025 10:08 9s
Pi-hole v6.0 documentation Check for merge conflicts #1211: Pull request #338 synchronize by yubiuser
January 18, 2025 11:09 11s
January 18, 2025 11:09 11s
Merge pull request #1158 from pi-hole/dependabot/pip/release/v6.0/pip… Check for merge conflicts #1210: Commit fa25479 pushed by yubiuser
January 18, 2025 11:09 2m 10s release/v6.0
release/v6.0
January 18, 2025 11:09 2m 10s
Pi-hole v6.0 documentation Check for merge conflicts #1209: Pull request #338 synchronize by yubiuser
January 18, 2025 11:09 2m 11s
January 18, 2025 11:09 2m 11s
Merge pull request #1157 from pi-hole/dependabot/npm_and_yarn/release… Check for merge conflicts #1208: Commit 4baebd9 pushed by yubiuser
January 18, 2025 11:09 2m 12s release/v6.0
release/v6.0
January 18, 2025 11:09 2m 12s
Merge pull request #1156 from pi-hole/dependabot/pip/master/pip-depen… Check for merge conflicts #1207: Commit d03b0a0 pushed by yubiuser
January 18, 2025 11:08 2m 14s master
master
January 18, 2025 11:08 2m 14s
Bump mkdocs-material from 9.5.49 to 9.5.50 in the pip-dependencies group Check for merge conflicts #1206: Pull request #1156 synchronize by dependabot bot
January 18, 2025 11:08 10s
January 18, 2025 11:08 10s
Bump mkdocs-material from 9.5.49 to 9.5.50 in the pip-dependencies group Check for merge conflicts #1205: Commit 850dbd3 pushed by dependabot bot
January 18, 2025 11:08 9s dependabot/pip/master/pip-dependencies-2f8f3f13ab
dependabot/pip/master/pip-dependencies-2f8f3f13ab
January 18, 2025 11:08 9s
Merge pull request #1155 from pi-hole/dependabot/npm_and_yarn/master/… Check for merge conflicts #1204: Commit c5569dc pushed by yubiuser
January 18, 2025 11:05 4m 14s master
master
January 18, 2025 11:05 4m 14s
Bump mkdocs-material from 9.5.49 to 9.5.50 in the pip-dependencies group Check for merge conflicts #1203: Commit 42926df pushed by dependabot bot
January 18, 2025 10:53 10s dependabot/pip/release/v6.0/pip-dependencies-2f8f3f13ab
dependabot/pip/release/v6.0/pip-dependencies-2f8f3f13ab
January 18, 2025 10:53 10s
Bump markdownlint-cli2 in the npm-dependencies group Check for merge conflicts #1202: Commit 99cd527 pushed by dependabot bot
January 18, 2025 10:45 9s dependabot/npm_and_yarn/release/v6.0/npm-dependencies-ea46a08d23
dependabot/npm_and_yarn/release/v6.0/npm-dependencies-ea46a08d23
January 18, 2025 10:45 9s
Bump mkdocs-material from 9.5.49 to 9.5.50 in the pip-dependencies group Check for merge conflicts #1201: Commit f8a8b87 pushed by dependabot bot
January 18, 2025 10:42 10s dependabot/pip/master/pip-dependencies-2f8f3f13ab
dependabot/pip/master/pip-dependencies-2f8f3f13ab
January 18, 2025 10:42 10s
Bump markdownlint-cli2 in the npm-dependencies group Check for merge conflicts #1200: Commit a81d2ce pushed by dependabot bot
January 18, 2025 10:26 9s dependabot/npm_and_yarn/master/npm-dependencies-ea46a08d23
dependabot/npm_and_yarn/master/npm-dependencies-ea46a08d23
January 18, 2025 10:26 9s
Pi-hole v6.0 documentation Check for merge conflicts #1199: Pull request #338 synchronize by yubiuser
January 11, 2025 14:04 2m 11s
January 11, 2025 14:04 2m 11s
Merge pull request #1153 from pi-hole/dependabot/github_actions/relea… Check for merge conflicts #1198: Commit cd993cb pushed by yubiuser
January 11, 2025 14:04 2m 12s release/v6.0
release/v6.0
January 11, 2025 14:04 2m 12s
Merge pull request #1152 from pi-hole/dependabot/github_actions/maste… Check for merge conflicts #1197: Commit 0fa0fbb pushed by yubiuser
January 11, 2025 14:02 2m 9s master
master
January 11, 2025 14:02 2m 9s
Bump eps1lon/actions-label-merge-conflict Check for merge conflicts #1196: Commit aa5f67a pushed by dependabot bot
January 11, 2025 10:36 12s dependabot/github_actions/release/v6.0/github_action-dependencies-8e56c5b59f
dependabot/github_actions/release/v6.0/github_action-dependencies-8e56c5b59f
January 11, 2025 10:36 12s
Bump eps1lon/actions-label-merge-conflict Check for merge conflicts #1195: Commit 975e880 pushed by dependabot bot
January 11, 2025 10:22 9s dependabot/github_actions/master/github_action-dependencies-8e56c5b59f
dependabot/github_actions/master/github_action-dependencies-8e56c5b59f
January 11, 2025 10:22 9s
Pi-hole v6.0 documentation Check for merge conflicts #1194: Pull request #338 synchronize by yubiuser
January 4, 2025 10:21 10s
January 4, 2025 10:21 10s
Merge pull request #1151 from pi-hole/dependabot/npm_and_yarn/release… Check for merge conflicts #1193: Commit 3cff012 pushed by yubiuser
January 4, 2025 10:21 2m 10s release/v6.0
release/v6.0
January 4, 2025 10:21 2m 10s
Bump markdownlint-cli2 in the npm-dependencies group Check for merge conflicts #1192: Commit 14ae4e7 pushed by dependabot bot
January 4, 2025 10:19 8s dependabot/npm_and_yarn/release/v6.0/npm-dependencies-c781d5456a
dependabot/npm_and_yarn/release/v6.0/npm-dependencies-c781d5456a
January 4, 2025 10:19 8s
Merge pull request #1150 from pi-hole/dependabot/npm_and_yarn/master/… Check for merge conflicts #1191: Commit 1cab594 pushed by yubiuser
January 4, 2025 10:13 2m 15s master
master
January 4, 2025 10:13 2m 15s