error: could not apply f9fb41bc... [Storage] Windows Session Scoped Data Source + CDI Clone and Hotplug implementation of it (#4571)
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 conftest.py
CONFLICT (content): Merge conflict in conftest.py
Auto-merging tests/storage/cdi_clone/conftest.py
CONFLICT (content): Merge conflict in tests/storage/cdi_clone/conftest.py
Auto-merging tests/storage/cdi_clone/test_clone.py
CONFLICT (content): Merge conflict in tests/storage/cdi_clone/test_clone.py
Auto-merging tests/storage/conftest.py
Auto-merging tests/storage/test_hotplug.py
CONFLICT (content): Merge conflict in tests/storage/test_hotplug.py
Auto-merging tests/utils.py
CONFLICT (content): Merge conflict in tests/utils.py