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

[hi] Rename some markdown files #1834

Closed
wants to merge 2 commits into from
Closed

[hi] Rename some markdown files #1834

wants to merge 2 commits into from

Conversation

shivam-sharma7
Copy link
Contributor

Describe your changes

renames 2 files: bare_metal_machine.md and client_server_architecture.md.

close: #1732

Checklist before opening this PR (put x in the checkboxes)

  • This PR does not contain plagiarism
    • don’t copy other people’s work unless you are quoting and contributing it to them.
  • I have signed off on all commits
    • signing off (ex: git commit -s) is to affirm that commits comply DCO. If you are working locally, you could add an alias to your gitconfig by running git config --global alias.ci "commit -s".

@shivam-sharma7
rename-file
8064ac4 
Signed-off-by: Shivam Sharma <meshivam81@gmail.com>
@netlify
Copy link

netlify bot commented Mar 22, 2023 •
edited
Loading

✅ Deploy Preview for cncfglossary ready!

Name Link
🔨 Latest commit 5f0bb88
🔍 Latest deploy log https://app.netlify.com/sites/cncfglossary/deploys/64453276188aca0008c700b0
😎 Deploy Preview https://deploy-preview-1834--cncfglossary.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@jihoon-seo jihoon-seo added the lang/hi for Hindi label Mar 22, 2023
anubha-v-ardhan
anubha-v-ardhan suggested changes Apr 22, 2023
View reviewed changes
Copy link
Contributor

@anubha-v-ardhan anubha-v-ardhan left a comment

Choose a reason for hiding this comment

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

Hi @shivam-sharma7, This PR if merged will add bare-metal-machine and client-server-architecture as additional files making them duplicate of the already existing ones.

In order to successfully perform a rename, we'll also need to delete already existing ones :)

@anubha-v-ardhan anubha-v-ardhan mentioned this pull request Apr 22, 2023
Closed
@shivam-sharma7
Copy link
Contributor Author

Hi @shivam-sharma7, This PR if merged will add bare-metal-machine and client-server-architecture as additional files making them duplicate of the already existing ones.

In order to successfully perform a rename, we'll also need to delete already existing ones :)

okay

anubha-v-ardhan
anubha-v-ardhan approved these changes Apr 23, 2023
View reviewed changes
Copy link
Contributor

@anubha-v-ardhan anubha-v-ardhan left a comment

Choose a reason for hiding this comment

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

LGTM!
Thank you @shivam-sharma7

anubha-v-ardhan
anubha-v-ardhan suggested changes Apr 23, 2023
View reviewed changes
Copy link
Contributor

@anubha-v-ardhan anubha-v-ardhan left a comment

Choose a reason for hiding this comment

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

@shivam-sharma7 DCO check on this PR is failing which basically means the commits are not signed. Can you fix this?
This PR is ready to merge otherwise

@SaarthakMaini
Copy link

I would recommend running the following commands:

git commit --amend -s
git push --force

to sign the DCO.

Hope this helps!

@shivam-sharma7
file deleted
5f0bb88 
    deleted: content/hi/bare_metal_machine.md
    deleted:    content/hi/client_server_architecture.md

Signed-off-by: Shivam Sharma <meshivam81@gmail.com>
@shivam-sharma7
Copy link
Contributor Author

@shivam-sharma7 DCO check on this PR is failing which basically means the commits are not signed. Can you fix this? This PR is ready to merge otherwise

done

@anubha-v-ardhan anubha-v-ardhan changed the base branch from main to dev-hi April 23, 2023 15:36
@anubha-v-ardhan anubha-v-ardhan changed the base branch from dev-hi to main April 23, 2023 15:36
@jihoon-seo
Copy link
Collaborator

@shivam-sharma7 Thank you for your work, but the target branch of this PR is main, not dev-hi.
Could you either modify this PR to target the dev-hi branch (which might be slightly difficult), or
open a new PR by following these steps:

  1. In your local dev env, sync your local dev-hi branch with the upstream branch cncf:dev-hi.
  2. Create a new feature branch from your synced local dev-hi branch.
  3. Create a commit that renames 2 files bare_metal_machine.md and client_server_architecture.md.
  4. Push the feature branch to your forked repo.
  5. Open a PR in this repo (cncf/glossary), setting the target branch as dev-hi, not main.

@shivam-sharma7 shivam-sharma7 deleted the rename-file/dev-hi branch September 4, 2023 03:23
@shivam-sharma7
Copy link
Contributor Author

opened new PR: #2348

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@anubha-v-ardhan anubha-v-ardhan anubha-v-ardhan requested changes

@sayantani11 sayantani11 Awaiting requested review from sayantani11

@jayesh-srivastava jayesh-srivastava Awaiting requested review from jayesh-srivastava jayesh-srivastava is a code owner

@Garima-Negi Garima-Negi Awaiting requested review from Garima-Negi Garima-Negi is a code owner

Assignees
No one assigned
Labels
lang/hi for Hindi
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[hi] Rename some markdown files
5 participants
@shivam-sharma7 @SaarthakMaini @jihoon-seo @Garima-Negi @anubha-v-ardhan