Navigation Menu

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

Cluster tooltip update #14967

Merged
merged 1 commit into from Jul 12, 2019
Merged

Cluster tooltip update #14967

merged 1 commit into from Jul 12, 2019

Conversation

jhbiggs
Copy link
Contributor

@jhbiggs jhbiggs commented Jun 18, 2019

Hi,

This pull request is in reference to issue #14151. I'm hopeful it contains only this issue resolution as was suggested in another issue.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. language/de Issues or PRs related to German language 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. labels Jun 18, 2019
@netlify
Copy link

netlify bot commented Jun 18, 2019

Deploy preview for kubernetes-io-master-staging ready!

Built with commit 246ea85

https://deploy-preview-14967--kubernetes-io-master-staging.netlify.com

@jhbiggs
Copy link
Contributor Author

jhbiggs commented Jun 20, 2019

Not sure if this is what the bot is telling me to do...

/assign @steveperry-53

@rlenferink
Copy link
Member

Hi @jhbiggs, what the bot suggested to you and how you used that information is correct :)

However, it still seems this PR contains a couple of commits that don't need to be there because they're already merged back. What you probably want to do is a git rebase and drop the commits we want to remove from this PR (we only need to keep b9827f9).

Some information on rebasing and dropping a commit: https://jwiegley.github.io/git-from-the-bottom-up/1-Repository/8-interactive-rebasing.html

What you probably want to do:

git checkout cluster-tooltip-update
git rebase -i HEAD~5

# Then delete the lines which commits we want to drop. Only keep b9827f9eca4cfefba73f3a0c50a576269588df58

# Save and quit

git push -f

If done correct, the pull request will be automatically updated 😃

@jhbiggs
Copy link
Contributor Author

jhbiggs commented Jun 22, 2019

Ok, I think I did it. Thanks for your help. I rebased (hopefully not too far back) and force-pushed onto my fork.

@tengqm
Copy link
Contributor

tengqm commented Jun 25, 2019

Can we separate this to two PRs: one for English and the other for German?

@rlenferink
Copy link
Member

@jhbiggs you rebase was correct :) can we drop the “Update index.md” commit as well which updates the German the localization? This won’t affect the k8s master branch as the German change was already merged in #14685.

@jhbiggs
Copy link
Contributor Author

jhbiggs commented Jun 25, 2019

Ok, rebased without the German changes.

@rlenferink rlenferink removed the language/de Issues or PRs related to German language label Jun 25, 2019
@rlenferink
Copy link
Member

@jhbiggs Perfect :) Thanks for doing so

@tengqm this is ready for review now.

@rlenferink
Copy link
Member

/assign @cody-clark
as PR wrangler for this week

@tengqm
Copy link
Contributor

tengqm commented Jul 12, 2019

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 12, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tengqm

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 Jul 12, 2019
@k8s-ci-robot k8s-ci-robot merged commit e76ccf3 into kubernetes:master Jul 12, 2019
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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. language/en Issues or PRs related to English language lgtm "Looks good to me", indicates that a PR is ready to be merged. 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.

None yet

6 participants