kubeclipper/console

[release-1.3] fix: the storageclass form used by select or input

Closed this issue · 0 comments

Manual cherrypick required.

#361 failed to apply on top of branch "release-1.3":

Applying: fix: the storageclass form used by select or input
Using index info to reconstruct a base tree...
M	src/components/FormRender/index.jsx
Falling back to patching base and 3-way merge...
Auto-merging src/components/FormRender/index.jsx
CONFLICT (content): Merge conflict in src/components/FormRender/index.jsx
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix: the storageclass form used by select or input
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".