[master] fix: adjust e2e case
kubeclipper-bot opened this issue · comments
Manual cherrypick required.
#288 failed to apply on top of branch "master":
Applying: fix: adjust e2e case
Using index info to reconstruct a base tree...
M config/common.js
M cypress/e2e/pages/cluster/backup.cy.js
Falling back to patching base and 3-way merge...
Auto-merging cypress/e2e/pages/cluster/backup.cy.js
Auto-merging config/common.js
CONFLICT (content): Merge conflict in config/common.js
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: adjust e2e case
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".