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
98 workflow run results
98 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #899 from pi-hole/group_dependabot Check for merge conflicts #429: Commit 85d7687 pushed by PromoFaux
September 10, 2023 20:00 2m 14s master
master
September 10, 2023 20:00 2m 14s
Group Dependabot pull requests by pachage ecosystem Check for merge conflicts #428: Pull request #899 synchronize by PromoFaux
September 10, 2023 11:57 12s
September 10, 2023 11:57 12s
Merge branch 'master' into group_dependabot Check for merge conflicts #427: Commit 68a9ecf pushed by PromoFaux
September 10, 2023 11:57 11s group_dependabot
group_dependabot
September 10, 2023 11:57 11s
Pi-hole v6.0 documentation Check for merge conflicts #426: Pull request #338 synchronize by yubiuser
September 9, 2023 17:58 26s
September 9, 2023 17:58 26s
Merge pull request #930 from pi-hole/dependabot/pip/release/v6.0/mkdo… Check for merge conflicts #425: Commit aaca424 pushed by yubiuser
September 9, 2023 17:58 2m 26s release/v6.0
release/v6.0
September 9, 2023 17:58 2m 26s
Pi-hole v6.0 documentation Check for merge conflicts #424: Pull request #338 synchronize by yubiuser
September 9, 2023 14:41 2m 12s
September 9, 2023 14:41 2m 12s
Merge pull request #929 from pi-hole/dependabot/github_actions/releas… Check for merge conflicts #423: Commit 5d6efcb pushed by yubiuser
September 9, 2023 14:41 16s release/v6.0
release/v6.0
September 9, 2023 14:41 16s
Bump mkdocs-material from 9.2.7 to 9.2.8 Check for merge conflicts #422: Commit 4e75aa7 pushed by dependabot bot
September 9, 2023 10:48 11s dependabot/pip/release/v6.0/mkdocs-material-9.2.8
dependabot/pip/release/v6.0/mkdocs-material-9.2.8
September 9, 2023 10:48 11s
Bump actions/checkout from 3.6.0 to 4.0.0 Check for merge conflicts #421: Commit 5ba0106 pushed by dependabot bot
September 9, 2023 10:00 14s dependabot/github_actions/release/v6.0/actions/checkout-4.0.0
dependabot/github_actions/release/v6.0/actions/checkout-4.0.0
September 9, 2023 10:00 14s
Add regex_id field of the query table Check for merge conflicts #420: Pull request #928 synchronize by DL6ER
September 8, 2023 21:07 13s
September 8, 2023 21:07 13s
Add regex_id field of the query table Check for merge conflicts #419: Commit 65f945e pushed by DL6ER
September 8, 2023 21:07 14s new/ftl_regex_id
new/ftl_regex_id
September 8, 2023 21:07 14s
Add regex_id field of the query table Check for merge conflicts #418: Commit 8f083d4 pushed by DL6ER
September 8, 2023 21:00 15s new/ftl_regex_id
new/ftl_regex_id
September 8, 2023 21:00 15s
Unattended install Check for merge conflicts #417: Pull request #927 synchronize by SK4ndal
September 7, 2023 20:33 14s
September 7, 2023 20:33 14s
Update nginx.md Check for merge conflicts #416: Pull request #926 synchronize by williamtrelawny
September 4, 2023 21:19 12s
September 4, 2023 21:19 12s
Update nginx.md Check for merge conflicts #415: Pull request #926 synchronize by williamtrelawny
September 4, 2023 21:05 13s
September 4, 2023 21:05 13s
Update nginx.md Check for merge conflicts #414: Pull request #926 synchronize by williamtrelawny
September 4, 2023 20:50 14s
September 4, 2023 20:50 14s
Pi-hole v6.0 documentation Check for merge conflicts #413: Pull request #338 synchronize by yubiuser
September 3, 2023 21:04 22s
September 3, 2023 21:04 22s
Merge pull request #923 from pi-hole/dependabot/pip/release/v6.0/mkdo… Check for merge conflicts #412: Commit 98afcb8 pushed by yubiuser
September 3, 2023 21:04 2m 16s release/v6.0
release/v6.0
September 3, 2023 21:04 2m 16s
Pi-hole v6.0 documentation Check for merge conflicts #411: Pull request #338 synchronize by yubiuser
September 3, 2023 21:03 21s
September 3, 2023 21:03 21s
Merge pull request #924 from pi-hole/dependabot/pip/release/v6.0/mkdo… Check for merge conflicts #410: Commit 1a68632 pushed by yubiuser
September 3, 2023 21:03 14s release/v6.0
release/v6.0
September 3, 2023 21:03 14s
Pi-hole v6.0 documentation Check for merge conflicts #409: Pull request #338 synchronize by yubiuser
September 3, 2023 21:02 11s
September 3, 2023 21:02 11s
Merge pull request #925 from pi-hole/dependabot/npm_and_yarn/release/… Check for merge conflicts #408: Commit 8057e2f pushed by yubiuser
September 3, 2023 21:02 2m 11s release/v6.0
release/v6.0
September 3, 2023 21:02 2m 11s
Bump markdownlint-cli2 from 0.8.1 to 0.9.2 Check for merge conflicts #407: Pull request #925 synchronize by dependabot bot
September 3, 2023 21:02 11s
September 3, 2023 21:02 11s
Bump markdownlint-cli2 from 0.8.1 to 0.9.2 Check for merge conflicts #406: Commit fbfbaa1 pushed by dependabot bot
September 3, 2023 21:02 11s dependabot/npm_and_yarn/release/v6.0/markdownlint-cli2-0.9.2
dependabot/npm_and_yarn/release/v6.0/markdownlint-cli2-0.9.2
September 3, 2023 21:02 11s
Bump markdownlint-cli2 from 0.8.1 to 0.9.2 Check for merge conflicts #405: Pull request #925 synchronize by dependabot bot
September 3, 2023 21:01 13s
September 3, 2023 21:01 13s