error: could not apply b315c128... [Storage] Use source_dict for DataVolume source specification, refactor create_dv (#5443)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"


Auto-merging tests/chaos/conftest.py
Auto-merging tests/chaos/snapshot/conftest.py
CONFLICT (content): Merge conflict in tests/chaos/snapshot/conftest.py
Auto-merging tests/conftest.py
CONFLICT (content): Merge conflict in tests/conftest.py
Auto-merging tests/data_protection/oadp/conftest.py
Auto-merging tests/infrastructure/golden_images/update_boot_source/test_ssp_common_templates_boot_sources.py
CONFLICT (content): Merge conflict in tests/infrastructure/golden_images/update_boot_source/test_ssp_common_templates_boot_sources.py
Auto-merging tests/infrastructure/golden_images/update_boot_source/test_ssp_data_sources.py
CONFLICT (content): Merge conflict in tests/infrastructure/golden_images/update_boot_source/test_ssp_data_sources.py
Auto-merging tests/infrastructure/instance_types/conftest.py
CONFLICT (content): Merge conflict in tests/infrastructure/instance_types/conftest.py
Auto-merging tests/infrastructure/instance_types/supported_os/conftest.py
Auto-merging tests/observability/metrics/utils.py
Auto-merging tests/scale/test_scale_benchmark.py
Auto-merging tests/storage/cdi_clone/test_clone.py
Auto-merging tests/storage/cdi_import/conftest.py
Auto-merging tests/storage/cdi_import/test_import_http.py
Auto-merging tests/storage/cross_cluster_live_migration/conftest.py
CONFLICT (content): Merge conflict in tests/storage/cross_cluster_live_migration/conftest.py
Auto-merging tests/storage/golden_image/test_golden_image.py
Auto-merging tests/storage/hpp/utils.py
Auto-merging tests/storage/online_resize/conftest.py
Auto-merging tests/storage/online_resize/test_online_resize.py
Auto-merging tests/storage/restricted_namespace_cloning/conftest.py
Auto-merging tests/storage/restricted_namespace_cloning/test_restricted_namespace_cloning.py
Auto-merging tests/storage/restricted_namespace_cloning/utils.py
Auto-merging tests/storage/storage_migration/conftest.py
Auto-merging tests/storage/test_cdi_certificate.py
Auto-merging tests/storage/test_cdi_resources.py
Auto-merging tests/storage/test_wffc.py
Auto-merging tests/storage/utils.py
Auto-merging tests/storage/vm_export/utils.py
CONFLICT (content): Merge conflict in tests/storage/vm_export/utils.py
Auto-merging tests/utils.py
Auto-merging tests/virt/cluster/longevity_tests/utils.py
CONFLICT (content): Merge conflict in tests/virt/cluster/longevity_tests/utils.py
Auto-merging tests/virt/cluster/vm_cloning/test_vm_cloning.py
Auto-merging tests/virt/upgrade/conftest.py
Auto-merging tests/virt/upgrade_custom/vgpu/conftest.py
Auto-merging tests/virt/utils.py
Auto-merging utilities/oadp.py
Auto-merging utilities/storage.py
CONFLICT (content): Merge conflict in utilities/storage.py