Skip to content

Actions: pi-hole/PADD

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflict.yml
39 workflow run results
39 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

PADD v3.11.1 Check for merge conflicts #293: Pull request #355 synchronize by yubiuser
September 23, 2023 11:31 12s
September 23, 2023 11:31 12s
Bump actions/checkout from 4.0.0 to 4.1.0 (#369) Check for merge conflicts #292: Commit 8ba8def pushed by yubiuser
September 23, 2023 11:31 2m 11s development
development
September 23, 2023 11:31 2m 11s
Bump actions/checkout from 4.0.0 to 4.1.0 Check for merge conflicts #291: Commit cf1d5df pushed by dependabot bot
September 23, 2023 10:46 36s dependabot/github_actions/development/actions/checkout-4.1.0
dependabot/github_actions/development/actions/checkout-4.1.0
September 23, 2023 10:46 36s
Make PADD compatible with FTLv6 Check for merge conflicts #290: Pull request #247 synchronize by yubiuser
September 10, 2023 19:36 14s
September 10, 2023 19:36 14s
Merge branch 'development' into PADD_FTLv6 Check for merge conflicts #289: Commit d221947 pushed by yubiuser
September 10, 2023 19:36 10s PADD_FTLv6
PADD_FTLv6
September 10, 2023 19:36 10s
PADD v3.11.1 Check for merge conflicts #288: Pull request #355 synchronize by yubiuser
September 10, 2023 19:34 12s
September 10, 2023 19:34 12s
Sync master back into development (#367) Check for merge conflicts #287: Commit 069cd43 pushed by yubiuser
September 10, 2023 19:34 2m 12s development
development
September 10, 2023 19:34 2m 12s
Do not try to remove stale label on PRs (#357) Check for merge conflicts #286: Commit 81aeac9 pushed by PromoFaux
September 10, 2023 11:53 2m 10s master
master
September 10, 2023 11:53 2m 10s
PADD v3.11.1 Check for merge conflicts #285: Pull request #355 synchronize by yubiuser
September 9, 2023 18:50 2m 12s
September 9, 2023 18:50 2m 12s
Bump actions/checkout from 3.6.0 to 4.0.0 (#365) Check for merge conflicts #284: Commit 7ef7e75 pushed by yubiuser
September 9, 2023 18:50 2m 16s development
development
September 9, 2023 18:50 2m 16s
Bump actions/checkout from 3.6.0 to 4.0.0 Check for merge conflicts #283: Commit c1577f1 pushed by dependabot bot
September 9, 2023 10:28 12s dependabot/github_actions/development/actions/checkout-4.0.0
dependabot/github_actions/development/actions/checkout-4.0.0
September 9, 2023 10:28 12s
PADD v3.11.1 Check for merge conflicts #282: Pull request #355 synchronize by yubiuser
August 26, 2023 11:22 11s
August 26, 2023 11:22 11s
Bump actions/checkout from 3.5.3 to 3.6.0 (#364) Check for merge conflicts #281: Commit a479053 pushed by yubiuser
August 26, 2023 11:22 2m 12s development
development
August 26, 2023 11:22 2m 12s
Bump actions/checkout from 3.5.3 to 3.6.0 Check for merge conflicts #280: Commit 7c9ce49 pushed by dependabot bot
August 26, 2023 10:46 10s dependabot/github_actions/development/actions/checkout-3.6.0
dependabot/github_actions/development/actions/checkout-3.6.0
August 26, 2023 10:46 10s
Make PADD compatible with FTLv6 Check for merge conflicts #279: Pull request #247 synchronize by yubiuser
August 2, 2023 20:11 13s
August 2, 2023 20:11 13s
When running locally derive port from FTL itself (#362) Check for merge conflicts #278: Commit c6e8f07 pushed by yubiuser
August 2, 2023 20:11 11s PADD_FTLv6
PADD_FTLv6
August 2, 2023 20:11 11s
When running locally derive port from FTL itself Check for merge conflicts #277: Pull request #362 synchronize by yubiuser
August 2, 2023 19:44 12s
August 2, 2023 19:44 12s
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
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