Skip to content

Actions: pi-hole/PADD

Actions

Check for merge conflicts

Actions

Loading...

Show workflow options

Create status badge

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

Filter by event
Status

Filter by status
Branch
Actor

Filter by actor
PADD v3.11.1 (#355) Check for merge conflicts #301: Commit fb92108 pushed by yubiuser
September 25, 2023 04:28 15s master
master
September 25, 2023 04:28 15s
PADD v3.11.1 Check for merge conflicts #300: Pull request #355 synchronize by yubiuser
September 24, 2023 07:17 10s
September 24, 2023 07:17 10s
Bump version to v3.11.1 (#371) Check for merge conflicts #299: Commit 70826ce pushed by yubiuser
September 24, 2023 07:17 2m 12s development
development
September 24, 2023 07:17 2m 12s
[WIP] Make PADD compatible with FTLv6 Check for merge conflicts #298: Pull request #247 synchronize by yubiuser
September 24, 2023 07:13 13s
September 24, 2023 07:13 13s
Merge branch 'development' into PADD_FTLv6 Check for merge conflicts #297: Commit 2bed00c pushed by yubiuser
September 24, 2023 07:13 15s PADD_FTLv6
PADD_FTLv6
September 24, 2023 07:13 15s
PADD v3.11.1 Check for merge conflicts #296: Pull request #355 synchronize by yubiuser
September 24, 2023 06:02 17s
September 24, 2023 06:02 17s
Use unset to reset CPU temp variable on each iteration (#370) Check for merge conflicts #295: Commit e619eee pushed by yubiuser
September 24, 2023 06:02 2m 17s development
development
September 24, 2023 06:02 2m 17s
Use unset to reset CPU temp variable on each iteration Check for merge conflicts #294: Commit f873331 pushed by rdwebdesign
September 24, 2023 00:54 10s reset_cpu_var
reset_cpu_var
September 24, 2023 00:54 10s
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
[WIP] 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
[WIP] 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