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 #1131 from pi-hole/dependabot/npm_and_yarn/master/… Check for merge conflicts #1138: Commit baa9a74 pushed by yubiuser
November 16, 2024 13:43 2m 11s master
master
November 16, 2024 13:43 2m 11s
Pi-hole v6.0 documentation Check for merge conflicts #1137: Pull request #338 synchronize by yubiuser
November 16, 2024 13:42 13s
November 16, 2024 13:42 13s
Merge pull request #1130 from pi-hole/dependabot/npm_and_yarn/release… Check for merge conflicts #1136: Commit 9794504 pushed by yubiuser
November 16, 2024 13:42 2m 10s release/v6.0
release/v6.0
November 16, 2024 13:42 2m 10s
Bump markdownlint-cli2 in the npm-dependencies group Check for merge conflicts #1135: Commit 143f996 pushed by dependabot bot
November 16, 2024 10:34 15s dependabot/npm_and_yarn/master/npm-dependencies-e1e9c494c9
dependabot/npm_and_yarn/master/npm-dependencies-e1e9c494c9
November 16, 2024 10:34 15s
Bump markdownlint-cli2 in the npm-dependencies group Check for merge conflicts #1134: Commit 20e630f pushed by dependabot bot
November 16, 2024 10:27 14s dependabot/npm_and_yarn/release/v6.0/npm-dependencies-e1e9c494c9
dependabot/npm_and_yarn/release/v6.0/npm-dependencies-e1e9c494c9
November 16, 2024 10:27 14s
Pi-hole v6.0 documentation Check for merge conflicts #1133: Pull request #338 synchronize by DL6ER
November 15, 2024 17:41 2m 15s
November 15, 2024 17:41 2m 15s
Add note that FTL will run much slower in valgrind Check for merge conflicts #1132: Commit ef32afc pushed by DL6ER
November 15, 2024 17:41 11s release/v6.0
release/v6.0
November 15, 2024 17:41 11s
Pi-hole v6.0 documentation Check for merge conflicts #1131: Pull request #338 synchronize by DL6ER
November 12, 2024 08:33 16s
November 12, 2024 08:33 16s
Rename ftldns/debugging -> ftldns/gdb for clarity Check for merge conflicts #1130: Commit 51543da pushed by DL6ER
November 12, 2024 08:33 2m 11s release/v6.0
release/v6.0
November 12, 2024 08:33 2m 11s
Pi-hole v6.0 documentation Check for merge conflicts #1129: Pull request #338 synchronize by DL6ER
November 11, 2024 13:16 2m 9s
November 11, 2024 13:16 2m 9s
Add note about not being able to debug forks using gdb Check for merge conflicts #1128: Commit 8e155e3 pushed by DL6ER
November 11, 2024 13:16 2m 10s release/v6.0
release/v6.0
November 11, 2024 13:16 2m 10s
Pi-hole v6.0 documentation Check for merge conflicts #1127: Pull request #338 synchronize by yubiuser
November 9, 2024 16:27 2m 11s
November 9, 2024 16:27 2m 11s
Add missing word Check for merge conflicts #1126: Commit 1f77aba pushed by yubiuser
November 9, 2024 16:27 2m 11s release/v6.0
release/v6.0
November 9, 2024 16:27 2m 11s
Pi-hole v6.0 documentation Check for merge conflicts #1125: Pull request #338 synchronize by yubiuser
November 9, 2024 11:07 14s
November 9, 2024 11:07 14s
Merge pull request #1129 from pi-hole/dependabot/pip/release/v6.0/pip… Check for merge conflicts #1124: Commit 5a9b17e pushed by yubiuser
November 9, 2024 11:07 2m 13s release/v6.0
release/v6.0
November 9, 2024 11:07 2m 13s
Bump the pip-dependencies group with 2 updates Check for merge conflicts #1123: Commit bd877ca pushed by dependabot bot
November 9, 2024 10:58 10s dependabot/pip/release/v6.0/pip-dependencies-9f7f3b73eb
dependabot/pip/release/v6.0/pip-dependencies-9f7f3b73eb
November 9, 2024 10:58 10s
Merge pull request #1128 from pi-hole/dependabot/pip/master/pip-depen… Check for merge conflicts #1122: Commit 3f14a2d pushed by yubiuser
November 9, 2024 10:46 2m 10s master
master
November 9, 2024 10:46 2m 10s
Bump the pip-dependencies group with 2 updates Check for merge conflicts #1121: Commit f883a82 pushed by dependabot bot
November 9, 2024 10:36 10s dependabot/pip/master/pip-dependencies-9f7f3b73eb
dependabot/pip/master/pip-dependencies-9f7f3b73eb
November 9, 2024 10:36 10s
Pi-hole v6.0 documentation Check for merge conflicts #1120: Pull request #338 synchronize by DL6ER
November 9, 2024 07:49 2m 8s
November 9, 2024 07:49 2m 8s
Add gdb section introduction Check for merge conflicts #1119: Commit b027938 pushed by DL6ER
November 9, 2024 07:49 2m 10s release/v6.0
release/v6.0
November 9, 2024 07:49 2m 10s
Pi-hole v6.0 documentation Check for merge conflicts #1118: Pull request #338 synchronize by DL6ER
November 9, 2024 07:35 2m 12s
November 9, 2024 07:35 2m 12s
Merge branch 'master' into release/v6.0 Check for merge conflicts #1117: Commit 3836980 pushed by DL6ER
November 9, 2024 07:35 13s release/v6.0
release/v6.0
November 9, 2024 07:35 13s
Merge pull request #1127 from pi-hole/dependabot/pip/master/pip-depen… Check for merge conflicts #1116: Commit 77d4108 pushed by yubiuser
November 2, 2024 10:39 2m 10s master
master
November 2, 2024 10:39 2m 10s
Bump mkdocs-material from 9.5.42 to 9.5.43 in the pip-dependencies group Check for merge conflicts #1115: Commit babbea8 pushed by dependabot bot
November 2, 2024 10:35 10s dependabot/pip/master/pip-dependencies-0610082a93
dependabot/pip/master/pip-dependencies-0610082a93
November 2, 2024 10:35 10s
Pi-hole v6.0 documentation Check for merge conflicts #1114: Pull request #338 synchronize by yubiuser
November 2, 2024 10:11 12s
November 2, 2024 10:11 12s