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

Fix: use default strategic merge type in example #31112

Closed
wants to merge 2 commits into from

Conversation

huikang
Copy link
Contributor

@huikang huikang commented Dec 26, 2021

To make it consistent with the subsection title (Use strategic merge patch...)

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Dec 26, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
To complete the pull request process, please assign savitharaghunathan after the PR has been reviewed.
You can assign the PR to them by writing /assign @savitharaghunathan in a comment when ready.

The full list of commands accepted by this bot can be found 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 language/en Issues or PRs related to English language sig/docs Categorizes an issue or PR as relevant to SIG Docs. labels Dec 26, 2021
@netlify
Copy link

netlify bot commented Dec 26, 2021

✔️ Deploy Preview for kubernetes-io-main-staging ready!

🔨 Explore the source changes: 29213de

🔍 Inspect the deploy log: https://app.netlify.com/sites/kubernetes-io-main-staging/deploys/62068fd35a31ec00084a29cd

😎 Browse the preview: https://deploy-preview-31112--kubernetes-io-main-staging.netlify.app

Copy link
Contributor

@sftim sftim left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks to me like this is fixing a bug. We definitely want bug fixes.

If you were typing this out, you wouldn't need to specify strategic type as that's the default. In docs, it's often helpful to be explicit - and that's why I've suggested retaining --type.

@sftim
Copy link
Contributor

sftim commented Jan 1, 2022

@huikang, can you outline the steps you've taken to verify that the updated page is accurate? That'll help us to review.

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 25, 2022
@Babapool
Copy link
Member

Babapool commented Feb 1, 2022

Hi @huikang, a friendly ping are you still working on this PR? Thanks!

@reylejano
Copy link
Member

Hi @huikang , please take a look at the recommendation in the earlier comment

There's a possible merge conflict, please rebase

@huikang , a PR Wrangler may close this PR if this PR is no longer worked on

huikang and others added 2 commits February 11, 2022 11:32
To make it consistent with the subsection title (Use strategic merge patch...)
…ect-kubectl-patch.md

Co-authored-by: Tim Bannister <tim@scalefactory.com>
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Feb 11, 2022
@huikang huikang closed this Feb 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. language/en Issues or PRs related to English language sig/docs Categorizes an issue or PR as relevant to SIG Docs. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants