Skip to content

Actions: pi-hole/docker-pi-hole

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflict.yml
840 workflow runs
840 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Bump black in /test in the pip group across 1 directory Check for merge conflicts #939: Commit 1030759 pushed by dependabot bot
September 2, 2024 21:19 16s dependabot/pip/test/pip-81350e123e
dependabot/pip/test/pip-81350e123e
September 2, 2024 21:19 16s
Merge branch 'development' into master Check for merge conflicts #938: Commit a796a89 pushed by PromoFaux
September 2, 2024 21:19 10s master
master
September 2, 2024 21:19 10s
Sync master back into development Check for merge conflicts #937: Pull request #1639 synchronize by PromoFaux
September 2, 2024 21:19 2m 9s
September 2, 2024 21:19 2m 9s
Update branch name in sync-back-to-dev workflow Check for merge conflicts #936: Commit 4cb3c3a pushed by PromoFaux
September 2, 2024 21:18 2m 10s master
master
September 2, 2024 21:18 2m 10s
Bump pytest-testinfra from 10.0.0 to 10.1.1 in /test Check for merge conflicts #935: Commit 24c3c1c pushed by dependabot bot
September 2, 2024 21:16 12s dependabot/pip/test/development/pytest-testinfra-10.1.1
dependabot/pip/test/development/pytest-testinfra-10.1.1
September 2, 2024 21:16 12s
Bump pytest from 7.4 to 8.3.2 in /test Check for merge conflicts #934: Commit 35ebebc pushed by dependabot bot
September 2, 2024 21:16 16s dependabot/pip/test/development/pytest-8.3.2
dependabot/pip/test/development/pytest-8.3.2
September 2, 2024 21:16 16s
Bump black from 23.12.0 to 24.8.0 in /test Check for merge conflicts #933: Commit 34f6116 pushed by dependabot bot
September 2, 2024 21:16 13s dependabot/pip/test/development/black-24.8.0
dependabot/pip/test/development/black-24.8.0
September 2, 2024 21:16 13s
Bump pytest-xdist from 3.5.0 to 3.6.1 in /test Check for merge conflicts #932: Commit 10572f7 pushed by dependabot bot
September 2, 2024 21:16 12s dependabot/pip/test/development/pytest-xdist-3.6.1
dependabot/pip/test/development/pytest-xdist-3.6.1
September 2, 2024 21:16 12s
Merge pull request #1633 from pi-hole/sort-master-scheduled-build Check for merge conflicts #931: Commit f96fddd pushed by PromoFaux
September 2, 2024 21:15 2m 10s master
master
September 2, 2024 21:15 2m 10s
[Housekeeping] Bring build script across from development Check for merge conflicts #930: Pull request #1633 synchronize by PromoFaux
September 2, 2024 21:09 9s
September 2, 2024 21:09 9s
update dependabot.yml to run against development not dev - remove… Check for merge conflicts #929: Commit bd54136 pushed by PromoFaux
September 2, 2024 21:09 10s sort-master-scheduled-build
sort-master-scheduled-build
September 2, 2024 21:09 10s
remove old build scripts from master (we wont use them again) and bri… Check for merge conflicts #928: Commit fa5344e pushed by PromoFaux
September 2, 2024 21:05 10s sort-master-scheduled-build
sort-master-scheduled-build
September 2, 2024 21:05 10s
Merge pull request #1626 from pi-hole/development-v6 Check for merge conflicts #927: Commit c38a6ea pushed by PromoFaux
September 2, 2024 20:59 13s development
development
September 2, 2024 20:59 13s
Development v6 -> dev Check for merge conflicts #926: Pull request #1626 synchronize by PromoFaux
September 2, 2024 20:58 13s
September 2, 2024 20:58 13s
Merge pull request #1632 from pi-hole/build-scripts-once-v6-in-dev Check for merge conflicts #925: Commit d00f17f pushed by PromoFaux
September 2, 2024 20:57 10s development-v6
development-v6
September 2, 2024 20:57 10s
Final changes for merge to development Check for merge conflicts #924: Pull request #1632 synchronize by PromoFaux
September 2, 2024 20:55 11s
September 2, 2024 20:55 11s
Disbale arm64 testing for the time being Check for merge conflicts #923: Commit 9e39ed3 pushed by PromoFaux
September 2, 2024 20:55 13s build-scripts-once-v6-in-dev
build-scripts-once-v6-in-dev
September 2, 2024 20:55 13s
Final changes for merge to development Check for merge conflicts #922: Pull request #1632 synchronize by PromoFaux
September 2, 2024 20:46 9s
September 2, 2024 20:46 9s
dev branch becomes development Check for merge conflicts #921: Commit 32c5775 pushed by PromoFaux
September 2, 2024 20:46 9s build-scripts-once-v6-in-dev
build-scripts-once-v6-in-dev
September 2, 2024 20:46 9s
Final changes for merge to development Check for merge conflicts #920: Pull request #1632 synchronize by PromoFaux
September 2, 2024 20:38 13s
September 2, 2024 20:38 13s
update test container to use development branches (this may be remove… Check for merge conflicts #919: Commit 98adb75 pushed by PromoFaux
September 2, 2024 20:38 11s build-scripts-once-v6-in-dev
build-scripts-once-v6-in-dev
September 2, 2024 20:38 11s
Repo dev branch renamed to development Check for merge conflicts #918: Commit 820d63b pushed by PromoFaux
September 2, 2024 20:28 13s build-scripts-once-v6-in-dev
build-scripts-once-v6-in-dev
September 2, 2024 20:28 13s
Merge pull request #1620 from pi-hole/dependabot/pip/test/dev/black-2… Check for merge conflicts #917: Commit 6239412 pushed by PromoFaux
September 2, 2024 20:22 10s development
development
September 2, 2024 20:22 10s
Development v6 -> dev Check for merge conflicts #916: Pull request #1626 synchronize by PromoFaux
September 2, 2024 16:34 12s
September 2, 2024 16:34 12s
Add src/pihole-FTL to .gitignore Check for merge conflicts #915: Commit b012c80 pushed by PromoFaux
September 2, 2024 16:34 11s development-v6
development-v6
September 2, 2024 16:34 11s