kaspar030 / laze

82%

main: 80%

LAST BUILD ON BRANCH impr_conflicted_msg

branch: impr_conflicted_msg

CHANGE BRANCH

x

Reset

• impr_conflicted_msg
• add_logo
• add_module_conflicts
• bencher-for-prs
• bump-ci
• bump-deps
• cachdir.tag
• changelog-with-links
• cleanup
• clippy
• codegen-units
• config-typo
• context_provides
• contexts-list
• dependabot/cargo/anyhow-1.0.100
• dependabot/cargo/anyhow-1.0.45
• dependabot/cargo/anyhow-1.0.47
• dependabot/cargo/anyhow-1.0.48
• dependabot/cargo/anyhow-1.0.51
• dependabot/cargo/anyhow-1.0.52
• dependabot/cargo/anyhow-1.0.53
• dependabot/cargo/anyhow-1.0.54
• dependabot/cargo/anyhow-1.0.55
• dependabot/cargo/anyhow-1.0.56
• dependabot/cargo/anyhow-1.0.57
• dependabot/cargo/anyhow-1.0.58
• dependabot/cargo/anyhow-1.0.59
• dependabot/cargo/anyhow-1.0.60
• dependabot/cargo/anyhow-1.0.61
• dependabot/cargo/anyhow-1.0.68
• dependabot/cargo/anyhow-1.0.69
• dependabot/cargo/anyhow-1.0.95
• dependabot/cargo/anyhow-1.0.96
• dependabot/cargo/anyhow-1.0.97
• dependabot/cargo/anyhow-1.0.98
• dependabot/cargo/anyhow-1.0.99
• dependabot/cargo/build_uuid-0.3.1
• dependabot/cargo/camino-1.1.10
• dependabot/cargo/camino-1.1.11
• dependabot/cargo/camino-1.1.12
• dependabot/cargo/camino-1.1.3
• dependabot/cargo/clap-2.34.0
• dependabot/cargo/clap-3.1.1
• dependabot/cargo/clap-3.1.10
• dependabot/cargo/clap-3.1.12
• dependabot/cargo/clap-3.1.14
• dependabot/cargo/clap-3.1.15
• dependabot/cargo/clap-3.1.16
• dependabot/cargo/clap-3.1.17
• dependabot/cargo/clap-3.1.18
• dependabot/cargo/clap-3.1.2
• dependabot/cargo/clap-3.1.3
• dependabot/cargo/clap-3.1.5
• dependabot/cargo/clap-3.1.6
• dependabot/cargo/clap-3.1.8
• dependabot/cargo/clap-3.1.9
• dependabot/cargo/clap-3.2.2
• dependabot/cargo/clap-4.0.30
• dependabot/cargo/clap-4.0.32
• dependabot/cargo/clap-4.1.1
• dependabot/cargo/clap-4.1.3
• dependabot/cargo/clap-4.1.4
• dependabot/cargo/clap-4.1.6
• dependabot/cargo/clap-4.1.8
• dependabot/cargo/clap-4.5.24
• dependabot/cargo/clap-4.5.26
• dependabot/cargo/clap-4.5.27
• dependabot/cargo/clap-4.5.28
• dependabot/cargo/clap-4.5.29
• dependabot/cargo/clap-4.5.30
• dependabot/cargo/clap-4.5.31
• dependabot/cargo/clap-4.5.32
• dependabot/cargo/clap-4.5.34
• dependabot/cargo/clap-4.5.35
• dependabot/cargo/clap-4.5.37
• dependabot/cargo/clap-4.5.38
• dependabot/cargo/clap-4.5.39
• dependabot/cargo/clap-4.5.40
• dependabot/cargo/clap-4.5.41
• dependabot/cargo/clap-4.5.42
• dependabot/cargo/clap-4.5.43
• dependabot/cargo/clap-4.5.44
• dependabot/cargo/clap-4.5.45
• dependabot/cargo/clap-4.5.46
• dependabot/cargo/clap-4.5.47
• dependabot/cargo/clap-4.5.49
• dependabot/cargo/clap-4.5.50
• dependabot/cargo/clap_complete-4.0.7
• dependabot/cargo/clap_complete-4.1.0
• dependabot/cargo/clap_complete-4.1.1
• dependabot/cargo/clap_complete-4.1.2
• dependabot/cargo/clap_complete-4.1.3
• dependabot/cargo/clap_complete-4.1.4
• dependabot/cargo/clap_complete-4.5.39
• dependabot/cargo/clap_complete-4.5.40
• dependabot/cargo/clap_complete-4.5.41
• dependabot/cargo/clap_complete-4.5.42
• dependabot/cargo/clap_complete-4.5.43
• dependabot/cargo/clap_complete-4.5.44
• dependabot/cargo/clap_complete-4.5.45
• dependabot/cargo/clap_complete-4.5.46
• dependabot/cargo/clap_complete-4.5.47
• dependabot/cargo/clap_complete-4.5.48
• dependabot/cargo/clap_complete-4.5.50
• dependabot/cargo/clap_complete-4.5.51
• dependabot/cargo/clap_complete-4.5.54
• dependabot/cargo/clap_complete-4.5.55
• dependabot/cargo/clap_complete-4.5.56
• dependabot/cargo/clap_complete-4.5.57
• dependabot/cargo/clap_complete-4.5.58
• dependabot/cargo/clap_complete-4.5.59
• dependabot/cargo/clap_mangen-0.2.25
• dependabot/cargo/clap_mangen-0.2.26
• dependabot/cargo/clap_mangen-0.2.27
• dependabot/cargo/clap_mangen-0.2.28
• dependabot/cargo/clap_mangen-0.2.29
• dependabot/cargo/clap_mangen-0.2.30
• dependabot/cargo/clap_mangen-0.2.31
• dependabot/cargo/clap_mangen-0.2.6
• dependabot/cargo/clap_mangen-0.2.7
• dependabot/cargo/clap_mangen-0.2.8
• dependabot/cargo/clap_mangen-0.2.9
• dependabot/cargo/derive_builder-0.11.1
• dependabot/cargo/derive_builder-0.11.2
• dependabot/cargo/evalexpr-12.0.2
• dependabot/cargo/git-cache-0.2.4
• dependabot/cargo/indexmap-1.8.0
• dependabot/cargo/indexmap-1.8.1
• dependabot/cargo/indexmap-1.8.2
• dependabot/cargo/indexmap-1.9.0
• dependabot/cargo/indexmap-1.9.1
• dependabot/cargo/indexmap-2.10.0
• dependabot/cargo/indexmap-2.11.0
• dependabot/cargo/indexmap-2.11.1
• dependabot/cargo/indexmap-2.11.3
• dependabot/cargo/indexmap-2.11.4
• dependabot/cargo/indexmap-2.12.0
• dependabot/cargo/indexmap-2.7.1
• dependabot/cargo/indexmap-2.8.0
• dependabot/cargo/indexmap-2.9.0
• dependabot/cargo/itertools-0.14.0
• dependabot/cargo/jobslot-0.2.23
• dependabot/cargo/mimalloc-0.1.27
• dependabot/cargo/mimalloc-0.1.28
• dependabot/cargo/mimalloc-0.1.29
• dependabot/cargo/mimalloc-0.1.34
• dependabot/cargo/mimalloc-0.1.44
• dependabot/cargo/mimalloc-0.1.45
• dependabot/cargo/mimalloc-0.1.46
• dependabot/cargo/mimalloc-0.1.47
• dependabot/cargo/mimalloc-0.1.48
• dependabot/cargo/pathdiff-0.2.1
• dependabot/cargo/rayon-1.11.0
• dependabot/cargo/rayon-1.5.2
• dependabot/cargo/rayon-1.5.3
• dependabot/cargo/rayon-1.6.1
• dependabot/cargo/rust-embed-6.4.0
• dependabot/cargo/rust-embed-8.6.0
• dependabot/cargo/rust-embed-8.7.0
• dependabot/cargo/rust-embed-8.7.1
• dependabot/cargo/rust-embed-8.7.2
• dependabot/cargo/rust-embed-8.8.0
• dependabot/cargo/semver-1.0.24
• dependabot/cargo/semver-1.0.25
• dependabot/cargo/semver-1.0.26
• dependabot/cargo/semver-1.0.27
• dependabot/cargo/serde-1.0.131
• dependabot/cargo/serde-1.0.132
• dependabot/cargo/serde-1.0.133
• dependabot/cargo/serde-1.0.136
• dependabot/cargo/serde-1.0.137
• dependabot/cargo/serde-1.0.138
• dependabot/cargo/serde-1.0.139
• dependabot/cargo/serde-1.0.140
• dependabot/cargo/serde-1.0.141
• dependabot/cargo/serde-1.0.142
• dependabot/cargo/serde-1.0.143
• dependabot/cargo/serde-1.0.149
• dependabot/cargo/serde-1.0.150
• dependabot/cargo/serde-1.0.151
• dependabot/cargo/serde-1.0.152
• dependabot/cargo/serde-1.0.216
• dependabot/cargo/serde-1.0.217
• dependabot/cargo/serde-1.0.218
• dependabot/cargo/serde-1.0.219
• dependabot/cargo/serde-1.0.223
• dependabot/cargo/serde-1.0.225
• dependabot/cargo/serde-1.0.227
• dependabot/cargo/serde-1.0.228
• dependabot/cargo/serde_json-1.0.134
• dependabot/cargo/serde_json-1.0.135
• dependabot/cargo/serde_json-1.0.137
• dependabot/cargo/serde_json-1.0.138
• dependabot/cargo/serde_json-1.0.139
• dependabot/cargo/serde_json-1.0.140
• dependabot/cargo/serde_json-1.0.141
• dependabot/cargo/serde_json-1.0.142
• dependabot/cargo/serde_json-1.0.143
• dependabot/cargo/serde_json-1.0.145
• dependabot/cargo/serde_yaml-0.8.23
• dependabot/cargo/serde_yaml-0.8.24
• dependabot/cargo/serde_yaml-0.8.25
• dependabot/cargo/serde_yaml-0.8.26
• dependabot/cargo/serde_yaml-0.9.1
• dependabot/cargo/serde_yaml-0.9.16
• dependabot/cargo/serde_yaml-0.9.17
• dependabot/cargo/serde_yaml-0.9.2
• dependabot/cargo/serde_yaml-0.9.4
• dependabot/cargo/serde_yaml-0.9.9
• dependabot/cargo/shell-words-1.1.0
• dependabot/cargo/shellexpand-3.1.1
• dependabot/cargo/signal-hook-0.3.12
• dependabot/cargo/signal-hook-0.3.13
• dependabot/cargo/signal-hook-0.3.14
• dependabot/cargo/signal-hook-0.3.15
• dependabot/cargo/signal-hook-0.3.18
• dependabot/cargo/simple-error-0.3.0
• dependabot/cargo/subst-0.3.8
• dependabot/cargo/tempfile-3.15.0
• dependabot/cargo/tempfile-3.16.0
• dependabot/cargo/tempfile-3.17.0
• dependabot/cargo/tempfile-3.17.1
• dependabot/cargo/tempfile-3.18.0
• dependabot/cargo/tempfile-3.19.0
• dependabot/cargo/tempfile-3.19.1
• dependabot/cargo/tempfile-3.20.0
• dependabot/cargo/tempfile-3.21.0
• dependabot/cargo/tempfile-3.22.0
• dependabot/cargo/tempfile-3.23.0
• dependabot/cargo/thiserror-2.0.10
• dependabot/cargo/thiserror-2.0.11
• dependabot/cargo/thiserror-2.0.12
• dependabot/cargo/thiserror-2.0.14
• dependabot/cargo/thiserror-2.0.15
• dependabot/cargo/thiserror-2.0.16
• dependabot/cargo/thiserror-2.0.17
• dependabot/cargo/thiserror-2.0.7
• dependabot/cargo/thiserror-2.0.8
• dependabot/cargo/thiserror-2.0.9
• dependabot/cargo/uuid-1.11.1
• dependabot/cargo/uuid-1.12.0
• dependabot/cargo/uuid-1.12.1
• dependabot/cargo/uuid-1.13.1
• dependabot/cargo/uuid-1.13.2
• dependabot/cargo/uuid-1.14.0
• dependabot/cargo/uuid-1.15.0
• dependabot/cargo/uuid-1.15.1
• dependabot/cargo/uuid-1.16.0
• dependabot/cargo/uuid-1.3.0
• dev
• docs/aur
• docs/simply-sourcing-fish-completions
• drone-test
• dynamic-completions
• env-hashmap
• env-laze-builders-empty
• env-use-im-union
• eval_gcc_dep
• expose_provided_unsuccessful
• extend-rule-hash
• feat/absolute-root
• fix-bencher-ci-install
• fix-clippy
• fix-tasks-leaking-empty-var
• fix_build_time_deps
• fix_define_value_separator
• fix_expr_state_reset
• fix_instrument_coverage
• fix_release_asset_version
• gcc-deps-for-custom-builds
• git-cache-fixes
• git-cliff-config
• grcov_nightly_test
• im_for_resolver_state
• improve_dep_trace
• includes
• increase_env_coverage
• increase_ninja_test_coverage
• install-perfg
• jobslot
• laze-local.yml
• main
• make_jobserver_output_optional
• make_out_sharing_optional
• manpage
• master
• master_pre_refactored
• must-provide
• new-release-workflow
• panic-on-clean
• pass_git_info_to_GIT_PATCH
• patch-1
• path-slash
• pr/arg_required_else_help
• pr/clarify_version_limitation
• pr/envmap
• pr/feat/inspect
• pr/fix/empty_env_merge
• pr/logger
• pr/nested_key/from_tostring
• pr/refactor/split_commands
• pr/signals/refactor
• pr/task/cmd_windows
• pr/task/working_dir
• pr/windows/initial
• rebase-clone
• refactor_resolver
• refactored
• refactored_pub_crate
• rspfile-path-sep
• rule_pass_through_missing_var
• rules-exports
• select_support_if_deps
• shell_completions
• shell_completions_doc
• shell_words_for_verbose_tasks
• shorten-workdir
• spr/kaspar030/cleanup-remove-obsolete-pgo-script
• switch_to_camino
• task_args_v2
• tasks-call-tasks
• tasks-execute-msg-verbose
• tasks-in-modules
• test_rustup_update_in_container
• use-selfhosted-action-workers

Build # 14128829961

Build Type

Pull #693

github

Committed by web-flow

Commit Message

Merge e5c69a976 into bad1ceddf

Pull Request Pull Request #693: feat: improve "conflicted by" error message

Run Details

11 of 14 new or added lines in 1 file covered. (78.57%)

3626 of 4443 relevant lines covered (81.61%)

103.18 hits per line