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

Typo fix in conversion.md #985

Merged
merged 2 commits into from
Apr 16, 2018
Merged

Typo fix in conversion.md #985

merged 2 commits into from
Apr 16, 2018

Conversation

AdamDang
Copy link
Contributor

Kubernetes uses it's own->Kubernetes uses its own

Kubernetes uses it's own->Kubernetes uses its own
@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 Apr 15, 2018
@AdamDang AdamDang mentioned this pull request Apr 16, 2018
@hangyan
Copy link
Contributor

hangyan commented Apr 16, 2018

please merge the commits, one commit is enough

@AdamDang
Copy link
Contributor Author

@hangyan
Did you mean add some commits here?

@hangyan
Copy link
Contributor

hangyan commented Apr 16, 2018

No, merge the two commits into one.

@AdamDang
Copy link
Contributor Author

Hi @hangyan,
I am sorry. I really do not know how to modify two files in one commit.
I just learned how to put several commits in one PR. Please can you tell me?

Copy link
Contributor

@hangyan hangyan left a comment

Choose a reason for hiding this comment

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

Merge commits

@cdrage
Copy link
Member

cdrage commented Apr 16, 2018

There is a built-in "squish and merge" button on GitHub so I've gone ahead and done that.

@AdamDang next time just merge commits / only use one commit 👍

@cdrage cdrage merged commit d892abc into kubernetes:master Apr 16, 2018
@AdamDang AdamDang deleted the patch-2 branch May 1, 2018 02:31
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. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants