Skip to content

Actions: Chia-Network/chia-blockchain

Actions

🩹 Conflict Check

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflict-check.yml
18,339 workflow runs
18,339 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

refactor full_node add_block 🩹 Conflict Check #35686: Pull request #18584 synchronize by almogdepaz
September 29, 2024 17:18 13s
September 29, 2024 17:18 13s
add finish sync to add_blocks_in_batches 🩹 Conflict Check #35685: Commit 782bd01 pushed by almogdepaz
September 29, 2024 17:18 17s refactor_fork_info_usage
refactor_fork_info_usage
September 29, 2024 17:18 17s
refactor full_node add_block 🩹 Conflict Check #35684: Pull request #18584 synchronize by almogdepaz
September 29, 2024 15:07 18s
September 29, 2024 15:07 18s
Merge branch 'main' into refactor_fork_info_usage 🩹 Conflict Check #35683: Commit fa63740 pushed by almogdepaz
September 29, 2024 15:07 16s refactor_fork_info_usage
refactor_fork_info_usage
September 29, 2024 15:07 16s
refactor full_node add_block 🩹 Conflict Check #35682: Pull request #18584 synchronize by almogdepaz
September 29, 2024 12:07 9s
September 29, 2024 12:07 9s
fix_tests 🩹 Conflict Check #35681: Commit c4a4802 pushed by almogdepaz
September 29, 2024 12:07 13s refactor_fork_info_usage
refactor_fork_info_usage
September 29, 2024 12:07 13s
Replace pylint with ruff 🩹 Conflict Check #35680: Pull request #18649 opened by wallentx
September 28, 2024 03:06 12s
September 28, 2024 03:06 12s
build(deps): bump chiavdf from 1.1.4 to 1.1.6 🩹 Conflict Check #35679: Pull request #18634 synchronize by dependabot bot
September 27, 2024 22:30 16s
September 27, 2024 22:30 16s
build(deps): bump chiavdf from 1.1.4 to 1.1.6 🩹 Conflict Check #35678: Commit 36ae388 pushed by dependabot bot
September 27, 2024 22:30 14s dependabot/pip/chiavdf-1.1.6
dependabot/pip/chiavdf-1.1.6
September 27, 2024 22:30 14s
[CHIA-1437]: Reduce level log spam when downloading DAT files (#18610) 🩹 Conflict Check #35677: Commit c0c12b9 pushed by pmaslana
September 27, 2024 17:02 42s main
main
September 27, 2024 17:02 42s
remove no-wallet-found traceback from /dl_owned_singletons (#18632) 🩹 Conflict Check #35676: Commit 3ca9b5e pushed by pmaslana
September 27, 2024 17:00 37s main
main
September 27, 2024 17:00 37s
[CHIA-1348] Port chia wallet coin commands to @chia_command framework 🩹 Conflict Check #35675: Pull request #18641 synchronize by Quexington
September 27, 2024 16:18 12s
September 27, 2024 16:18 12s
coverage ignores 🩹 Conflict Check #35674: Commit 51fee38 pushed by Quexington
September 27, 2024 16:18 13s quex.port_coin_cmds_to_chia_command
quex.port_coin_cmds_to_chia_command
September 27, 2024 16:18 13s
use the lock file for pinning dependencies, not the project definition 🩹 Conflict Check #35673: Pull request #18305 synchronize by altendky
September 27, 2024 14:50 13s
September 27, 2024 14:50 13s
Merge branch 'main' into pin_in_lock 🩹 Conflict Check #35672: Commit 972884d pushed by altendky
September 27, 2024 14:50 13s pin_in_lock
pin_in_lock
September 27, 2024 14:50 13s
use the lock file for pinning dependencies, not the project definition 🩹 Conflict Check #35671: Pull request #18305 synchronize by altendky
September 27, 2024 14:46 14s
September 27, 2024 14:46 14s
trying v4.3.3 🩹 Conflict Check #35670: Commit a615b73 pushed by altendky
September 27, 2024 14:46 15s pin_in_lock
pin_in_lock
September 27, 2024 14:46 15s
[CHIA-1348] Port chia wallet coin commands to @chia_command framework 🩹 Conflict Check #35669: Pull request #18641 synchronize by Quexington
September 27, 2024 14:28 12s
September 27, 2024 14:28 12s
fix signer test 🩹 Conflict Check #35668: Commit b5ad8ac pushed by Quexington
September 27, 2024 14:28 16s quex.port_coin_cmds_to_chia_command
quex.port_coin_cmds_to_chia_command
September 27, 2024 14:28 16s
CHIA-1525 Make PreValidationResult take SpendBundleConditions instead of NPCResult 🩹 Conflict Check #35667: Pull request #18647 synchronize by AmineKhaldi
September 27, 2024 14:13 15s
September 27, 2024 14:13 15s
CHIA-1525 Make PreValidationResult take SpendBundleConditions instead of NPCResult 🩹 Conflict Check #35666: Pull request #18647 synchronize by AmineKhaldi
September 27, 2024 10:48 12s
September 27, 2024 10:48 12s
CHIA-1525 Make PreValidationResult take SpendBundleConditions instead of NPCResult 🩹 Conflict Check #35665: Pull request #18647 opened by AmineKhaldi
September 27, 2024 10:33 21s
September 27, 2024 10:33 21s
[CHIA-1348] Port chia wallet coin commands to @chia_command framework 🩹 Conflict Check #35664: Pull request #18641 synchronize by Quexington
September 26, 2024 21:40 12s
September 26, 2024 21:40 12s
fix command tests 🩹 Conflict Check #35663: Commit db75520 pushed by Quexington
September 26, 2024 21:40 16s quex.port_coin_cmds_to_chia_command
quex.port_coin_cmds_to_chia_command
September 26, 2024 21:40 16s
[CHIA-1348] Port chia wallet coin commands to @chia_command framework 🩹 Conflict Check #35662: Pull request #18641 synchronize by Quexington
September 26, 2024 21:25 15s
September 26, 2024 21:25 15s