agama-project / agama

63%

master: 68%

LAST BUILD ON BRANCH conflicts

branch: conflicts

CHANGE BRANCH

x

Reset

Sync Branches

• conflicts
• SLE-16
• SLE-16-self-update
• SLE-16-self-update-scc
• action_permissions
• adapt_to_v2
• add-check
• add-inst-script
• add-missing-gems
• add-more-libzypp-callbacks
• add-noto-sans-for-cyrillic-script
• add-signature-callbacks
• add_custom_repos
• add_ipconfig_link_local4
• add_ovs_support
• added_mysed_type
• adjust-webpack-config
• after-install-snapshot
• after-release-beta2
• agama-api-v2_network
• agama-api-v2_network-UI
• agama-api-v2_network-backend
• agama-config-generate
• agama-new-api
• agama-new-api-actors
• agama-new-api-ci
• agama-new-api-progress
• agama-new-api-traits
• agama-product-registration-fix
• agama-profile-apiurl
• agama-v2_hostname
• agama_config_insecure_rc3
• agama_download_insecure
• always-display-install-button
• api-option
• api-v2
• api-v2-product-selection
• api-v2-progress
• api-v2-storage-reset
• api-v2_network
• auto-insecure
• auto-scripts
• autologin-schema
• autoyast-iscsi
• autoyast-skip-list
• ay-services-manager-conversion
• better-agama-auto
• better-error-message
• better-logging
• better-testing
• better-url-handling
• better_reg_errors
• bind_interface
• boot-raid
• boot_from_candidate_raid
• bootloader_force_user_input
• bridge_support
• bsc#1234711
• bsc-1233160
• bsc-1245187
• bsc-1247248
• bsc-1248876
• bsc-1251898
• bsc-1251898-security
• bsc1243795-sle16
• bsc1244697
• bsc1244697_rc3
• bsc1249591
• bug_partitioned_raid
• bug_partitioned_raid_master
• bump-rustc
• cache-control
• cached_software
• cancel-link
• candidate-devices
• check-encryption-password
• checkmedia
• ci-doc-fix-rubygem
• ci_augeas_06
• ci_autoinst_schema
• ci_rust_cache
• clean-up
• clean-up-registration
• cleanup
• cli-offline-validation
• client-id
• clippy
• collect-logs
• configure_console_font
• confirm_format
• coveralls_config
• current_installation_phase_nil
• dasd-page-refactoring
• dbus_nm_versions
• debug-product-cache
• default_auto
• delete-proposed-drive
• delete-proposed-partition
• delete-vg
• delete_root_again
• delete_root_beta2
• device-selector-sorting
• disable-cfg-ci-lint
• disable_h264_master
• disable_local_repos
• display-load-error
• distrobox
• dns_priority
• download-api
• drop-dbus-l10n
• drop-dead-css
• drop-deviceselection
• drop-jsdoc
• drop-local-web-ui-path
• drop-model-lists
• drop-registration-alert
• drop-scope
• drop-typedoc
• drop-unused-module
• drop-xf86-packages
• drop_32bit
• drop_network_dbus_leftovers
• dud
• dud-kernel
• dud-support
• dud_repository
• edit-vg
• efi_locale
• empty_search
• enable-agama-scripts
• enable-dbus-monitor-live
• encode_connection_id
• encrypted_password
• env-storage
• esp-id
• eula-support
• expand_search
• explicit_boot_raid_upstream
• export-password
• export-solved-config
• expose-passwords
• extend-transfer-urls
• extended_collected_logs
• fast_rust_unit_tests
• files-service
• files_auto
• files_ay_convertor
• finish-phase
• first_software_fixes
• fix-DOM-nesting-at-login
• fix-agama-tests
• fix-auth-and-encryption-switches
• fix-ay-pre-scripts
• fix-bsc-1243415
• fix-converter
• fix-error-format
• fix-error-reporting
• fix-extensions-layout
• fix-fetch-logs
• fix-firstboot-keymap
• fix-installer-options-form-state
• fix-installer-options-state-sle-16-qu
• fix-iscsi
• fix-keymap
• fix-keymaps-i18n
• fix-lang-conversion
• fix-language-change
• fix-list-repositories
• fix-local-web_ui-path
• fix-localectl-mock
• fix-locales-test
• fix-logs-filename
• fix-long-string
• fix-manager-tests
• fix-maring-inline-start
• fix-md-checker
• fix-missing-translations
• fix-network-encoding
• fix-network-method
• fix-network-persist-rc3
• fix-openapi
• fix-openapi-schema
• fix-packaging
• fix-post-partitioning-scripts
• fix-prefix-handling
• fix-product-cache
• fix-product-change
• fix-product-change-again
• fix-products-cache
• fix-questions
• fix-questions-path
• fix-registration-workflow
• fix-schema
• fix-scripts
• fix-scripts-reader
• fix-selected-product-cache
• fix-services-manager-reader
• fix-set-keymap
• fix-software-cache
• fix-software-proposal
• fix-software-queries
• fix-storage-tests
• fix-storage-types
• fix-storage-ui
• fix-tests
• fix-transfer
• fix-urls
• fix-user-settings
• fix-ws-connection
• fix_and_validate_JSON_schema
• fix_autoconnect_of_ports
• fix_cmdline
• fix_copy_certificates
• fix_delete_bridge
• fix_gpg_callbacks
• fix_icewm_setup
• fix_install_url
• fix_kernel_filtering
• fix_multipath_env
• fix_product_selection
• fix_products_spec
• fix_shell_injection
• fix_storage_config
• fix_unattended_rmt
• fix_user_import
• fix_web_pot_sle16
• fix_wpa_eap_suite_b_192
• force-sizes
• fork-ts-checker-webpack-plugin
• generate_pvs
• gh-2647
• gitignore_openapi
• hackweek-ancor
• hackweek-config
• hashed_pasword
• hide-passwords
• hide_abort_option
• hostname-ui
• hostname_handling
• hot-fix-start-progress
• huha-fix-example
• i18n_web_refactoring
• ibft-yast-iscsi
• ignore_not_existing_active_connection
• import-autoyast-scripts
• improve-events
• improve-issues
• improve-logging
• improve-partition-form
• improve-reboot-feedback
• improve_logging
• improve_zypp_callbacks
• info_param
• inhibit
• insecure-users-crate
• install
• install_addon_products
• install_dir
• installation_finished_tpm
• integrate_agama_zypp
• invalid-locale
• ipmi
• ipmitool-fix-percent
• iscsi-discovery
• iso_label
• issue-2539
• issue-2662-fix-example-file
• issue-reorg
• json_devicegraph2
• kalpa
• keymap-only-local-connection
• kiwi-use-default-ruby
• l10n-service
• lang-and-keyboard-improvements
• leapmicro
• libzypp-errors
• libzypp_timeout_retry
• licenses-openapi
• licenses-translations
• limit_build_jobs2
• link_resolv
• live_build
• live_shellcheck
• llvm_tarpaulin
• localize-products-description
• log-progress-changed
• log_errors
• logs_api
• lsm_select
• lvm-form
• lvm_assembly_fix
• mac_address
• manager-service
• master
• merge-SLE-16
• merge-api-v2
• merge-master
• merge-sle-16
• merge-sle16
• merge_api_w2
• merge_leap16
• merge_leap_16.0
• merge_master_reg
• merge_rc3
• missing_textdomain
• missing_translations_SLE16
• missing_translations_master
• monitor
• more-reproducible
• move_to_json
• network-binding-improvements
• network-persistent-connections-handling
• network_dhcp_settings
• network_settings_optional
• network_state_fixes
• new-issues-api
• new-questions
• new_auth_model
• new_gettext_sle16
• new_libzypp_callbacks
• nm_autoconnect
• no-client
• no_more_fake_raids
• no_warning_on_skip
• non-blocking-issues
• non-blocking-progress
• nonEFI-fix
• noto-sans-as-fallback
• online_demo
• only_candidates
• only_required
• only_required_sles
• only_required_sles_test
• only_resize_existing
• openapi
• openapi-scripts
• optional-ipconfig-vectors
• out-of-sync-toast
• patternfly-6
• pfv6-round-1
• pfv6-round-3
• po_merge_17888380480
• po_merge_18068702331
• po_service_merge_17888381247
• po_service_merge_18068703236
• post-partitioning-scripts
• pre-scripts
• preselect-selinux
• preserve-ay-pre-scripts
• probe_agama_proposal
• product-registration
• product_fix
• product_registrion_poc_fix
• products_po_merge_sle16_17523186155
• profile-checker
• profile-help-typo
• profile_client
• query-key-factories
• question-ids-and-labels
• questions-config
• radashi
• raid_editor
• ratatui-monitor
• rc1
• rc1-fix-product-change
• rc3
• rc3-sync
• react-router-v7
• readable-test
• reboot
• reduce_retries
• register_addons
• registration-error
• registration-url
• registration_crate
• relative-urlref-files
• relax_dependencies
• release-12
• release-15
• release-16
• release-17
• release-18
• rellocate-install-tooltip
• remote-config-edit
• remove-setxkbmap
• rename_cmdline_args
• reorder_storage_ui
• replace_software
• repo_gpg
• repository_retry
• reprobe
• reprobe_button
• rescan-devices-progress
• reset_resolvables
• rethinking-encryption-layout
• retry-error
• retry_registration_cli
• revert-eslint-removal
• revert-unsigned-repo
• rework-users
• rmt_extension_fix
• rmt_registration
• rmt_registration_fix
• rubygem-subpackage
• run-chrooted-scripts
• run-init-scripts
• rust-translations
• rust_ci
• rust_faster_ci
• rusty-manager
• scc-proxy
• schema-URL
• schema-p1
• search_sort
• security_adapt
• security_callbacks
• select-packages
• select-packages-proposal
• select-raid
• show-config
• sle-16
• sle-16.1
• soft-ser_merge_master
• software-default-answer
• software-probe
• software-service
• software-service-api-v2
• software-service-boost-1
• software-service-cleanup
• software_service_queries
• software_solve_commit
• software_summary_screen
• software_test_robust
• spaces_in_translations
• sshKey
• storage-add-partition
• storage-boot-model
• storage-config-model
• storage-config-null
• storage-config-to-json
• storage-config-ui
• storage-config-ui-encryption
• storage-config-ui-master-sync-20250128
• storage-config-ui-merge-master
• storage-config-ui-show-result
• storage-config-ui-sync-20250219
• storage-config-ui-sync-master-20250121
• storage-configurator
• storage-edit-partition
• storage-fix-conversions
• storage-fixes
• storage-fs-label
• storage-generate-pvs
• storage-inhibitors
• storage-label-improvements
• storage-layout-cases
• storage-lvm
• storage-missing-config
• storage-new-api
• storage-new-api-ags8
• storage-new-api-schema1
• storage-new-api-schema2
• storage-refinements-jun-25
• storage-reload
• storage-reprobe
• storage-reset-config
• storage-schema-index
• storage-selector
• storage-selector-ancor
• storage-selector-new
• storage-set-config-model
• storage-show-config
• storage-show-vgs
• storage-ui-new-api
• storage-volume-keywords
• storage_merge_master
• storage_reprobe_fix
• store_no_product
• switch-to-wayland-and-gnome-shell
• sync-SLE-16
• sync-api-v2
• sync-api-v2-again
• sync-branch
• sync-queries
• systemd_link
• test_fix_rust
• threaded_zfcp
• timeout-stop-on-boot-menu
• timeout_and_retry
• tpm_pbkdf
• translate_scc_messages
• translated_string
• try_ibft_reorder
• try_ibft_reorder_master
• typo
• ui-fixes
• ui-format-device
• ui-improvements-202410
• ui-size-improvements
• ui-sync
• ui_event_handling
• unattended_multipath
• unselect_patterns
• unsigned-repo
• update-autoyast-compat
• update-deps-20250603
• update-deps-20250825
• update-spec-files
• upg-rust-deps
• user-pw-check
• user_patterns_selection
• user_repo_ay_convert
• users_mandatory_step
• v11
• v12
• v13.pre
• v15
• v16
• v17
• v18
• v18.pre
• validation
• version_18.pre
• vlan_support
• wip/honyczek/storage-autosizetext
• workaround_empty_proposal
• xtask
• zFCP_refresh
• zbus-5
• zfcp_unattended

Build # 15189243531

Build Type

Pull #2348

github

Committed by jreidinger

Commit Message

Merge remote-tracking branch 'origin/master' into conflicts

Pull Request Pull Request #2348: feat: allow software conflicts resolution

Run Details

92 of 132 branches covered (69.7%)

Branch coverage included in aggregate %.

13 of 44 new or added lines in 5 files covered. (29.55%)

21 existing lines in 2 files now uncovered.

10949 of 17477 relevant lines covered (62.65%)

42.78 hits per line