[master] fix: nodestore instance error
kubeclipper-bot opened this issue · comments
Manual cherrypick required.
#306 failed to apply on top of branch "master":
Applying: fix: nodestore instance error
Using index info to reconstruct a base tree...
M src/pages/cluster/components/SelectNodes/index.jsx
M src/pages/cluster/containers/Cluster/Detail/NodesList/actions/Add.jsx
M src/pages/cluster/containers/Cluster/actions/Create/Node.jsx
Falling back to patching base and 3-way merge...
Auto-merging src/pages/cluster/containers/Cluster/actions/Create/Node.jsx
Auto-merging src/pages/cluster/containers/Cluster/Detail/NodesList/actions/Add.jsx
Auto-merging src/pages/cluster/components/SelectNodes/index.jsx
CONFLICT (content): Merge conflict in src/pages/cluster/components/SelectNodes/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: nodestore instance error
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".