neo-project / neo-node

15%

master: 16%

LAST BUILD ON BRANCH support-conflict

branch: support-conflict

CHANGE BRANCH

x

Reset

Sync Branches

• support-conflict
• 3.0.0
• 3.0.0-CI01125
• 3.0.0-changelog
• 3.0.0-preview2
• 3.0.3
• 3.1.0
• 3.2.0
• 3.2.1
• 3.3.0
• 3.3.1
• 3.6.2
• 3.9.0
• 3.9.1
• 3.9.2
• Blockchain-display
• CI01070
• CI01123
• CI01130
• CI01148
• CI01171
• CI01234
• CI01257
• Fix-showstate
• HF_2712_FixSyscallFees
• MaxTraceableBlocks
• N3T5
• Neo-CI01982
• Preview4
• action-with-plugins
• add-data
• add-dockerfile
• add-getaccountstate
• add-sender
• add-testgas
• add-tojson
• add-totalsupply
• add-update
• add_delete_address_command
• add_leveldb_dependency
• add_unvote
• allow-sc-verify
• apply-signers
• archive
• auto-labels
• auto-release
• autoinstall-storage-provider
• autolabels-n3
• backup-changepass
• change-magic-preview3
• change-nep5-to-nep17
• change-view-fix
• changelog_update
• changelog_update_preview5
• clean-993-n3
• cli-script
• close-591
• close-601
• code-review
• codeql
• color-output
• color-state
• combine-config-protocol
• command-autofill
• conversion-methods
• copy-abi-to-nef
• copyright-in-files
• create-empty-wallet
• customize-data-path
• defect/magicNumber
• deploy-update-with-data
• devcontainer
• develop
• dockerfile-net7.0
• enable_change_password_in_cli_cmd
• feature-log
• feature/dns-doh
• feature/plugin-alc-plugins
• fill-default-settings
• fix-993
• fix-autostart
• fix-dockerfile
• fix-download-plugin
• fix-getnep17transfers
• fix-gui
• fix-improve
• fix-incomplete-sign
• fix-localnode
• fix-logger-path
• fix-logpath
• fix-manifestFilePath
• fix-mempool
• fix-neo-modules-228
• fix-open-wallet
• fix-plugin-command
• fix-show-state-uptime
• fix-signer-errro
• fix-storage-path
• fix-tokentracker
• fix-tokentracker-n3
• fix-vote
• fix.GetCandinates
• fix.n3.several-bugs
• fix.n3.unify-grpc-dep
• fix.several-bugs
• fix.show-state-uptime
• fix/console-locker-2995
• fix_broadcast_getheaders
• fix_cosigner
• fix_invoke
• fix_invoko_with_error
• fs-faun
• fs-protocol-settings
• get-next-validators
• get_expmsg_recur
• get_plugin_network
• happy-new-year-n3
• happy-new-year-n4
• improve-plugins-installation
• increase-version
• log-akka-errors
• makefile
• master
• master-n3
• message-sign
• mode-system
• n3-rpc-length
• n4-fix-rpc-wallet
• nativecontract
• neo-node/add/macos-action
• neo-node/fix/props-files
• nep5-commands
• net5
• new-icon
• nullable
• oracle-fix-n4
• patch-1
• patch-2
• patch-4
• plugin-dependancy
• port-dependences-neo-fs
• port-from-neo
• pr-921
• preview3
• preview5
• rc2
• rc3
• rc4
• readme-stash
• refs/pull/893/merge
• refs/pull/900/merge
• refs/pull/901/merge
• refs/pull/902/merge
• remove-dead-code
• remove-invalid-tx
• remove-tx-more-gas
• restart-command
• seperate-plugin-folder
• shargon-patch-1
• storage-dump-optimize
• strict-utf8
• sync-neo
• sync-neo-1380
• sync-neo2302
• transfer-optional-from
• unfiy-output
• update-1015
• update-config
• update-copyright
• update-dockerfile
• update-n3
• update-n4-version
• update-neo
• update-neo-nuget
• update-nu
• update-nuget
• update-packages
• update-plugins
• update-protocol-json
• update-seedlist
• update-vote-commands
• update_changelog
• update_name_nep17
• use-wallet-factory
• v2.9.3
• wallet-fix-n3

Build # 6481520391

Build Type

Pull #903

github

Committed by web-flow

Commit Message

Merge c0c438ec5 into 29d1aa9ea

Pull Request Pull Request #903: add cancel command for conflict attribute

Run Details

34 of 258 branches covered (0.0%)

Branch coverage included in aggregate %.

107 of 683 relevant lines covered (15.67%)

1.72 hits per line