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,905 workflow runs
17,905 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

[CHIA-1933] Remove get_new methods from CATWallet 🩹 Conflict Check #37967: Pull request #18965 synchronize by Quexington
December 2, 2024 22:43 13s
December 2, 2024 22:43 13s
Fix an instance in tails.py 🩹 Conflict Check #37966: Commit 939d402 pushed by Quexington
December 2, 2024 22:43 12s quex.remove_get_new_puzzle_from_cat_wallet
quex.remove_get_new_puzzle_from_cat_wallet
December 2, 2024 22:43 12s
[CHIA-1933] Remove get_new methods from CATWallet 🩹 Conflict Check #37965: Pull request #18965 synchronize by Quexington
December 2, 2024 22:36 11s
December 2, 2024 22:36 11s
Fix an instance in tails.py 🩹 Conflict Check #37964: Commit 789d6f5 pushed by Quexington
December 2, 2024 22:36 13s quex.remove_get_new_puzzle_from_cat_wallet
quex.remove_get_new_puzzle_from_cat_wallet
December 2, 2024 22:36 13s
[CHIA-1933] Remove get_new methods from CATWallet 🩹 Conflict Check #37963: Pull request #18965 opened by Quexington
December 2, 2024 22:28 13s
December 2, 2024 22:28 13s
Remove get_new methods from cat wallet 🩹 Conflict Check #37962: Commit 1392929 pushed by Quexington
December 2, 2024 22:28 11s quex.remove_get_new_puzzle_from_cat_wallet
quex.remove_get_new_puzzle_from_cat_wallet
December 2, 2024 22:28 11s
Remove get_new methods from cat wallet 🩹 Conflict Check #37961: Commit b4bea1e pushed by Quexington
December 2, 2024 22:25 13s quex.remove_get_new_puzzle_from_cat_wallet
quex.remove_get_new_puzzle_from_cat_wallet
December 2, 2024 22:25 13s
[CHIA-1731] Add comments about PLR6201 🩹 Conflict Check #37960: Pull request #18963 synchronize by Quexington
December 2, 2024 22:01 11s
December 2, 2024 22:01 11s
Change comment 🩹 Conflict Check #37959: Commit 6821702 pushed by Quexington
December 2, 2024 22:01 12s quex.key_data_secrete_mnemonic_tuple
quex.key_data_secrete_mnemonic_tuple
December 2, 2024 22:01 12s
[CHIA-1731] Add comments about PLR6201 🩹 Conflict Check #37958: Pull request #18963 synchronize by Quexington
December 2, 2024 22:01 13s
December 2, 2024 22:01 13s
Change comment 🩹 Conflict Check #37957: Commit cc46583 pushed by Quexington
December 2, 2024 22:01 13s quex.key_data_secrete_mnemonic_tuple
quex.key_data_secrete_mnemonic_tuple
December 2, 2024 22:01 13s
remove implementation from `BlockRecordProtocol.is_transaction_block(… 🩹 Conflict Check #37956: Commit cf49d9c pushed by pmaslana
December 2, 2024 21:51 57s main
main
December 2, 2024 21:51 57s
remove dangling pylint comment reference (#18937) 🩹 Conflict Check #37955: Commit 3a54c5d pushed by pmaslana
December 2, 2024 21:50 1m 44s main
main
December 2, 2024 21:50 1m 44s
explicitly set option parameter name based on field name for cmd clas… 🩹 Conflict Check #37954: Commit 3bfb4da pushed by pmaslana
December 2, 2024 21:50 1m 56s main
main
December 2, 2024 21:50 1m 56s
VALIDATE_GITHUB_ACTIONS: true 🩹 Conflict Check #37953: Pull request #18962 synchronize by altendky
December 2, 2024 21:43 19s
December 2, 2024 21:43 19s
wrong way, back again 🩹 Conflict Check #37952: Commit 2fa362b pushed by altendky
December 2, 2024 21:43 12s altendky-patch-40
altendky-patch-40
December 2, 2024 21:43 12s
Add simulator to installers 🩹 Conflict Check #37951: Pull request #18964 synchronize by cmmarslender
December 2, 2024 21:28 12s
December 2, 2024 21:28 12s
Point to correct path for start_simulator 🩹 Conflict Check #37950: Commit 44260f3 pushed by cmmarslender
December 2, 2024 21:28 15s sim-to-installers
sim-to-installers
December 2, 2024 21:28 15s
VALIDATE_GITHUB_ACTIONS: true 🩹 Conflict Check #37949: Pull request #18962 synchronize by altendky
December 2, 2024 21:26 15s
December 2, 2024 21:26 15s
there 🩹 Conflict Check #37948: Commit c2047ca pushed by altendky
December 2, 2024 21:26 13s altendky-patch-40
altendky-patch-40
December 2, 2024 21:26 13s
[CHIA-1731] Add comments about PLR6201 🩹 Conflict Check #37947: Pull request #18963 synchronize by Quexington
December 2, 2024 21:24 14s
December 2, 2024 21:24 14s
Add comments about PLR6201 🩹 Conflict Check #37946: Commit ea2a897 pushed by Quexington
December 2, 2024 21:23 12s quex.key_data_secrete_mnemonic_tuple
quex.key_data_secrete_mnemonic_tuple
December 2, 2024 21:23 12s
[CHIA-1731] Add comments about PLR6201 🩹 Conflict Check #37945: Pull request #18963 synchronize by Quexington
December 2, 2024 21:17 13s
December 2, 2024 21:17 13s
post init check for tuples 🩹 Conflict Check #37944: Commit cde56ad pushed by Quexington
December 2, 2024 21:16 11s quex.key_data_secrete_mnemonic_tuple
quex.key_data_secrete_mnemonic_tuple
December 2, 2024 21:16 11s
Add simulator to installers 🩹 Conflict Check #37943: Pull request #18964 opened by cmmarslender
December 2, 2024 21:14 12s
December 2, 2024 21:14 12s