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.

Sign up for GitHub

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

Jump to bottom

Remove .orig and _backup_ files #15011

Merged
merged 3 commits into from
Jun 20, 2019
Merged

Remove .orig and _backup_ files #15011

merged 3 commits into from
Jun 20, 2019

Conversation

makoscafee
Copy link
Contributor

During conflict resolution, a bunch of .orig and few backups were generated. here is to clean up the repo

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 20, 2019
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. language/en Issues or PRs related to English language sig/docs Categorizes an issue or PR as relevant to SIG Docs. labels Jun 20, 2019
@makoscafee makoscafee changed the title Remove orig backup files Remove .orig and _backup_ files Jun 20, 2019
makoscafee referenced this pull request Jun 20, 2019
@makoscafee
update with master content resolving merge conflicts
8781518
@netlify
Copy link

netlify bot commented Jun 20, 2019 •
edited
Loading

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

Built with commit c7be155

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

willseeyou
willseeyou reviewed Jun 20, 2019
View reviewed changes
Copy link
Contributor

@willseeyou willseeyou left a comment

Choose a reason for hiding this comment

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

Does the below 6 files do not need to delete?
content/en/docs/reference/command-line-tools-reference/federation-apiserver_BASE_76806.md
content/en/docs/reference/command-line-tools-reference/federation-apiserver_LOCAL_76806.md
content/en/docs/reference/command-line-tools-reference/federation-apiserver_REMOTE_76806.md
content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_alpha_certs_renew_all_BASE_17211.md
content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_alpha_certs_renew_all_LOCAL_17211.md
content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_alpha_certs_renew_all_REMOTE_17211.md

@makoscafee
Copy link
Contributor Author

@willseeyou they are supposed to be removed ... thanks

@tengqm
Copy link
Contributor

tengqm commented Jun 20, 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 Jun 20, 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 Jun 20, 2019
@k8s-ci-robot k8s-ci-robot merged commit fe5ca27 into kubernetes:master Jun 20, 2019
joaovitor pushed a commit to joaovitor/website that referenced this pull request Jul 5, 2019
@makoscafee @joaovitor
Remove .orig and _backup_ files (kubernetes#15011)
4fc412a 
* remove all .orig files

* remove all backup files

* remove base, local and remote backup files
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@willseeyou willseeyou willseeyou left review comments

@jimangel jimangel Awaiting requested review from jimangel

@xiangpengzhao xiangpengzhao Awaiting requested review from xiangpengzhao

Assignees

@tengqm tengqm

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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@makoscafee @tengqm @k8s-ci-robot @willseeyou