Skip to content

Actions: Chia-Network/chia-blockchain

Actions

🩹 Conflict Check

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflict-check.yml
17,639 workflow runs
17,639 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

remove the block fill rate limit of 70% when farming a block 🩹 Conflict Check #38451: Pull request #19005 synchronize by arvidn
December 11, 2024 17:48 13s
December 11, 2024 17:48 13s
Attempt to clarify why we add many aggsig conditions in make_and_send… 🩹 Conflict Check #38450: Commit 817a67a pushed by arvidn
December 11, 2024 17:48 15s remove-block-fill-rate-limit
remove-block-fill-rate-limit
December 11, 2024 17:48 15s
use height to hash in short sync (#19007) 🩹 Conflict Check #38449: Commit 3ab83f0 pushed by pmaslana
December 11, 2024 17:05 45s main
main
December 11, 2024 17:05 45s
[CHIA-1316] Port VC Endpoints to @marshal decorator 🩹 Conflict Check #38448: Pull request #18970 synchronize by Quexington
December 11, 2024 16:56 13s
December 11, 2024 16:56 13s
address comments by @altendky 🩹 Conflict Check #38447: Commit 841ec8e pushed by Quexington
December 11, 2024 16:56 17s quex.port_vc_to_marshal
quex.port_vc_to_marshal
December 11, 2024 16:56 17s
Update changelog for 2.5.0 🩹 Conflict Check #38446: Pull request #19030 opened by emlowe
December 11, 2024 16:50 11s
December 11, 2024 16:50 11s
Update changelog for 2.5.0 🩹 Conflict Check #38445: Commit 6fc5d45 pushed by emlowe
December 11, 2024 16:49 11s EL.2.5.0-changelog
EL.2.5.0-changelog
December 11, 2024 16:49 11s
Add puzzles, driver and lifecycle tests for revocable CATs 🩹 Conflict Check #38444: Pull request #19000 synchronize by greimela
December 11, 2024 16:37 11s
December 11, 2024 16:37 11s
Add puzzles, driver and lifecycle tests for revocable CATs 🩹 Conflict Check #38443: Pull request #19000 synchronize by greimela
December 11, 2024 16:32 12s
December 11, 2024 16:32 12s
catchup: into long_lived/datalayer_merkle_blob from main @ 214ecf79d… 🩹 Conflict Check #38442: Commit 186d83a pushed by altendky
December 11, 2024 16:25 1m 0s long_lived/datalayer_merkle_blob
long_lived/datalayer_merkle_blob
December 11, 2024 16:25 1m 0s
build(deps): bump pytest from 8.3.3 to 8.3.4 🩹 Conflict Check #38441: Pull request #19020 synchronize by dependabot bot
December 11, 2024 16:21 3m 41s
December 11, 2024 16:21 3m 41s
build(deps): bump pytest from 8.3.3 to 8.3.4 🩹 Conflict Check #38440: Commit e263f2b pushed by dependabot bot
December 11, 2024 16:21 3m 32s dependabot/pip/pytest-8.3.4
dependabot/pip/pytest-8.3.4
December 11, 2024 16:21 3m 32s
task referencer 🩹 Conflict Check #38439: Pull request #18914 synchronize by altendky
December 11, 2024 16:19 2m 11s
December 11, 2024 16:19 2m 11s
Merge branch 'main' into task_pit 🩹 Conflict Check #38438: Commit 9c350ab pushed by altendky
December 11, 2024 16:19 2m 10s task_pit
task_pit
December 11, 2024 16:19 2m 10s
build(deps): bump coverage from 7.6.4 to 7.6.9 (#19021) 🩹 Conflict Check #38437: Commit 7e72d7c pushed by pmaslana
December 11, 2024 16:18 2m 2s main
main
December 11, 2024 16:18 2m 2s
build(deps): bump boto3 from 1.35.73 to 1.35.77 (#19019) 🩹 Conflict Check #38436: Commit 4d70c76 pushed by pmaslana
December 11, 2024 16:18 2m 16s main
main
December 11, 2024 16:18 2m 16s
build(deps): bump pytest-cov from 5.0.0 to 6.0.0 (#19018) 🩹 Conflict Check #38435: Commit 3308c85 pushed by pmaslana
December 11, 2024 16:17 1m 15s main
main
December 11, 2024 16:17 1m 15s
build(deps): bump anyio from 4.6.2.post1 to 4.7.0 (#19016) 🩹 Conflict Check #38434: Commit de7a74e pushed by pmaslana
December 11, 2024 16:16 1m 4s main
main
December 11, 2024 16:16 1m 4s
Track weight proof tasks (#18896) 🩹 Conflict Check #38433: Commit f6e08ba pushed by pmaslana
December 11, 2024 16:16 1m 17s main
main
December 11, 2024 16:16 1m 17s
task referencer 🩹 Conflict Check #38432: Pull request #18914 synchronize by altendky
December 11, 2024 16:13 20s
December 11, 2024 16:13 20s
Merge branch 'main' into task_pit 🩹 Conflict Check #38431: Commit b3c016d pushed by altendky
December 11, 2024 16:13 21s task_pit
task_pit
December 11, 2024 16:13 21s
build(deps): bump aiohttp from 3.11.9 to 3.11.10 (#19015) 🩹 Conflict Check #38430: Commit a4a4be3 pushed by pmaslana
December 11, 2024 16:13 54s main
main
December 11, 2024 16:13 54s
[CHIA-1829] don't drop outgoing response messages (#18990) 🩹 Conflict Check #38429: Commit c4e714e pushed by pmaslana
December 11, 2024 16:09 54s main
main
December 11, 2024 16:09 54s
CHIA-1945 Avoid computing a transactions filter with just reward coins when the filter is not requested from get_block_header 🩹 Conflict Check #38428: Pull request #18969 synchronize by AmineKhaldi
December 11, 2024 14:42 12s
December 11, 2024 14:42 12s
CHIA-1862 Fix FullNodeAPI's request_block_headers returned filter 🩹 Conflict Check #38427: Pull request #18923 synchronize by AmineKhaldi
December 11, 2024 14:31 22s
December 11, 2024 14:31 22s