Closed shubham-pampattiwar closed 1 year ago
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: kaovilai, shubham-pampattiwar, sseago
The full list of commands accepted by this bot can be found here.
The pull request process is described here
/cherry-pick oadp-1.2
@shubham-pampattiwar: #249 failed to apply on top of branch "oadp-1.2":
Applying: fix e2e CI
Using index info to reconstruct a base tree...
M controllers/restic.go
Falling back to patching base and 3-way merge...
Auto-merging controllers/restic.go
CONFLICT (content): Merge conflict in controllers/restic.go
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 e2e CI
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".
/cherry-pick-oadp-1.2