Closed nickboldt closed 1 week ago
[APPROVALNOTIFIER] This PR is NOT APPROVED
This pull-request has been approved by: Once this PR has been reviewed and has the lgtm label, please ask for approval from nickboldt. For more information see the Kubernetes Code Review Process.
The full list of commands accepted by this bot can be found here.
Issues
0 New issues
0 Accepted issues
Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code
/cherry-pick 1.2.x
@nickboldt: once the present PR merges, I will cherry-pick it on top of 1.2.x in a new PR and assign it to you.
/cherry-pick 1.1.x
@nickboldt: once the present PR merges, I will cherry-pick it on top of 1.1.x in a new PR and assign it to you.
The image is available at: quay.io/janus-idp/backstage-showcase:pr-1338
!
@nickboldt: #1338 failed to apply on top of branch "1.1.x":
Applying: chore(deps): clean out old tar-6.2.0 in favour of tar-6.2.1 from yarn.lock
Using index info to reconstruct a base tree...
M yarn.lock
Falling back to patching base and 3-way merge...
Auto-merging yarn.lock
CONFLICT (content): Merge conflict in yarn.lock
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 chore(deps): clean out old tar-6.2.0 in favour of tar-6.2.1 from yarn.lock
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".
@nickboldt: new pull request created: #1348
/cherry-pick cancel 1.1.x
@nickboldt: cannot checkout cancel
: error checking out "cancel": exit status 1 error: pathspec 'cancel' did not match any file(s) known to git
What does this PR do?
chore(deps): clean out old tar-6.2.0 in favour of tar-6.2.1 from yarn.lock
Signed-off-by: Nick Boldt nboldt@redhat.com
Screenshot/screencast of this PR
N/A
What issues does this PR fix or reference?
https://issues.redhat.com/browse/RHIDP-2806
How to test this PR?
N/A
PR Checklist
As the author of this Pull Request I made sure that:
Reviewers
Reviewers, please comment how you tested the PR when approving it.