Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Repair dev-1.18 and sync master (redo #19221) #19233

Conversation

zacharysarah
Copy link
Contributor

This PR replicates #19221.

This PR is necessary because #19221 was merged manually instead of with Prow. The manual merge applied the default repo merge strategy of squash. Sync PRs must merge with the merge method.

Note that #19221 had the tide/merge-method-merge label applied, but the manual merge overrode the tide label.

For more information about why the merge method matters, see kubernetes/test-infra#13065 (comment).

Effect on open PRs

When this PR merges, all open PRs based on dev-1.18 will probably need to rebase.

Double check the merge strategy

  1. Make sure this PR has the label tide/merge-method-merge. 👉

  2. Merge this PR via Prow with /lgtm and /approve. Do not merge this PR manually.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 21, 2020
@k8sio-netlify-preview-bot
Copy link
Collaborator

k8sio-netlify-preview-bot commented Feb 21, 2020

Deploy preview for kubernetes-io-vnext-staging processing.

Building with commit bad124b

https://app.netlify.com/sites/kubernetes-io-vnext-staging/deploys/5e5050212b18be000accd119

@zacharysarah zacharysarah added the tide/merge-method-merge Denotes a PR that should use a standard merge by tide when it merges. label Feb 21, 2020
@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Feb 21, 2020
@k8s-ci-robot k8s-ci-robot added language/zh Issues or PRs related to Chinese language sig/docs Categorizes an issue or PR as relevant to SIG Docs. labels Feb 21, 2020
@zacharysarah zacharysarah force-pushed the repair-dev.1-18-round-2-fight branch from cdf6278 to bad124b Compare February 21, 2020 21:48
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by:

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 21, 2020
@zacharysarah
Copy link
Contributor Author

/reopen

@k8s-ci-robot
Copy link
Contributor

@zacharysarah: Failed to re-open PR: state cannot be changed. There are no new commits on the zacharysarah:repair-dev.1-18-round-2-fight branch.

In response to this:

/reopen

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@zacharysarah
Copy link
Contributor Author

/unapprove

@zacharysarah zacharysarah added tide/merge-method-rebase Denotes a PR that should be rebased by tide when it merges. and removed tide/merge-method-merge Denotes a PR that should use a standard merge by tide when it merges. labels Feb 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. language/zh Issues or PRs related to Chinese language sig/docs Categorizes an issue or PR as relevant to SIG Docs. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. tide/merge-method-rebase Denotes a PR that should be rebased by tide when it merges.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants