Skip to content

Actions: pi-hole/PADD

Actions

Check for merge conflicts

Actions

Loading...

Show workflow options

Create status badge

merge-conflict.yml
146 workflow runs
146 workflow runs
Event

Filter by event
Status

Filter by status
Branch
Actor

Filter by actor
Remove space Check for merge conflicts #276: Commit b67b0fb pushed by yubiuser
August 2, 2023 19:44 10s set_port
set_port
August 2, 2023 19:44 10s
When running locally derive port from FTL itself Check for merge conflicts #275: Pull request #362 synchronize by yubiuser
August 2, 2023 19:35 11s
August 2, 2023 19:35 11s
When running locally derive port from FTL itself Check for merge conflicts #274: Commit 4a69af0 pushed by yubiuser
August 2, 2023 19:35 14s set_port
set_port
August 2, 2023 19:35 14s
When running locally derive port from FTL itself Check for merge conflicts #273: Commit d734d16 pushed by yubiuser
August 2, 2023 19:31 11s set_port
set_port
August 2, 2023 19:31 11s
[WIP] Make PADD compatible with FTLv6 Check for merge conflicts #272: Pull request #247 synchronize by yubiuser
August 1, 2023 07:59 11s
August 1, 2023 07:59 11s
Fix the missing dash for some options on the help text (#361) Check for merge conflicts #271: Commit 9b8dc56 pushed by yubiuser
August 1, 2023 07:59 11s PADD_FTLv6
PADD_FTLv6
August 1, 2023 07:59 11s
Fix the missing dash for some options on the help text Check for merge conflicts #270: Pull request #361 synchronize by rdwebdesign
July 31, 2023 22:09 13s
July 31, 2023 22:09 13s
Fix spellcheck and a few spaces Check for merge conflicts #269: Commit 794d7b0 pushed by rdwebdesign
July 31, 2023 22:09 12s fix/PADDftl6_help
fix/PADDftl6_help
July 31, 2023 22:09 12s
Add on the help text the missing dash for xoff and yoff options Check for merge conflicts #268: Commit 36257d1 pushed by rdwebdesign
July 31, 2023 21:47 14s fix/PADDftl6_help
fix/PADDftl6_help
July 31, 2023 21:47 14s
[WIP] Make PADD compatible with FTLv6 Check for merge conflicts #267: Pull request #247 synchronize by yubiuser
July 31, 2023 21:00 9s
July 31, 2023 21:00 9s
Change default API port to 80 Check for merge conflicts #266: Commit 57b102c pushed by yubiuser
July 31, 2023 21:00 9s PADD_FTLv6
PADD_FTLv6
July 31, 2023 21:00 9s
[WIP] Make PADD compatible with FTLv6 Check for merge conflicts #265: Pull request #247 synchronize by yubiuser
July 31, 2023 20:58 14s
July 31, 2023 20:58 14s
Merge branch 'development' into PADD_FTLv6 Check for merge conflicts #264: Commit b68de2b pushed by yubiuser
July 31, 2023 20:58 10s PADD_FTLv6
PADD_FTLv6
July 31, 2023 20:58 10s
PADD v3.11.1 Check for merge conflicts #263: Pull request #355 synchronize by yubiuser
July 31, 2023 20:55 14s
July 31, 2023 20:55 14s
Remove leftover stickler file (#360) Check for merge conflicts #262: Commit 0e733b5 pushed by yubiuser
July 31, 2023 20:55 2m 11s development
development
July 31, 2023 20:55 2m 11s
Remove leftover stickler file Check for merge conflicts #261: Commit 39065b2 pushed by yubiuser
July 31, 2023 20:50 10s no_stickler
no_stickler
July 31, 2023 20:50 10s
PADD v3.11.1 Check for merge conflicts #260: Pull request #355 synchronize by yubiuser
July 31, 2023 20:45 13s
July 31, 2023 20:45 13s
Add note regarding the update status of special Docker tags (#356) Check for merge conflicts #259: Commit 3290744 pushed by yubiuser
July 31, 2023 20:45 2m 11s development
development
July 31, 2023 20:45 2m 11s
Do not try to remove stale label on PRs Check for merge conflicts #258: Pull request #357 synchronize by PromoFaux
July 16, 2023 21:28 11s
July 16, 2023 21:28 11s
Tweak to the conditional Check for merge conflicts #257: Commit b60ffd2 pushed by PromoFaux
July 16, 2023 21:28 11s fix/un-stale
fix/un-stale
July 16, 2023 21:28 11s
Add note regarding the update status of special Docker tags Check for merge conflicts #256: Pull request #356 synchronize by yubiuser
July 10, 2023 11:54 11s
July 10, 2023 11:54 11s
Add note regarding the update status of special Docker tags Check for merge conflicts #255: Commit 4bf06ff pushed by yubiuser
July 10, 2023 11:54 10s docker_no_update
docker_no_update
July 10, 2023 11:54 10s
PADD v3.11.1 Check for merge conflicts #254: Pull request #355 synchronize by yubiuser
June 10, 2023 12:12 2m 10s
June 10, 2023 12:12 2m 10s
Bump actions/checkout from 3.4.0 to 3.5.3 (#358) Check for merge conflicts #253: Commit 436f82b pushed by yubiuser
June 10, 2023 12:12 2m 11s development
development
June 10, 2023 12:12 2m 11s
Bump actions/checkout from 3.4.0 to 3.5.3 Check for merge conflicts #252: Commit c299f87 pushed by dependabot bot
June 10, 2023 10:59 14s dependabot/github_actions/development/actions/checkout-3.5.3
dependabot/github_actions/development/actions/checkout-3.5.3
June 10, 2023 10:59 14s