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

Intermediate Contributing Page: Update Work from a local clone section #16748

Merged
merged 1 commit into from
Oct 27, 2019
Merged

Intermediate Contributing Page: Update Work from a local clone section #16748

merged 1 commit into from
Oct 27, 2019

Conversation

aimeeu
Copy link
Contributor

@aimeeu aimeeu commented Oct 8, 2019

Update Work from a local clone section based on my experiences as a new contributor.

Clone the repo: changed order, added how to check remotes

Work on local repo:
1 - 2: clarified why docs uses this workflow vs the Community one - see thread in #sig-contribex
9. Change to use git commit -a --amend so users don't create a new commit with each update
12. Added section on how to squash commits

Fixes: #15873

Preview Page: https://deploy-preview-16748--kubernetes-io-master-staging.netlify.com/docs/contribute/intermediate/

Signed-off-by: Aimee Ukasick [email protected]

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 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 Oct 8, 2019
@netlify
Copy link

netlify bot commented Oct 8, 2019

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

Built with commit fd73d4d

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

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.

Some feedback; a few nits and one concern about recommending forced pushes.

content/en/docs/contribute/intermediate.md Show resolved Hide resolved
content/en/docs/contribute/intermediate.md Outdated Show resolved Hide resolved
content/en/docs/contribute/intermediate.md Outdated Show resolved Hide resolved
content/en/docs/contribute/intermediate.md Outdated Show resolved Hide resolved
content/en/docs/contribute/intermediate.md Outdated Show resolved Hide resolved
content/en/docs/contribute/intermediate.md Outdated Show resolved Hide resolved
content/en/docs/contribute/intermediate.md Outdated Show resolved Hide resolved
content/en/docs/contribute/intermediate.md Outdated Show resolved Hide resolved
content/en/docs/contribute/intermediate.md Outdated Show resolved Hide resolved
content/en/docs/contribute/intermediate.md Show resolved Hide resolved
Copy link
Contributor

@zacharysarah zacharysarah left a comment

Choose a reason for hiding this comment

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

@aimeeu Thanks for this, it's great to have fresh eyes on this. ✨

content/en/docs/contribute/intermediate.md Outdated Show resolved Hide resolved
content/en/docs/contribute/intermediate.md Outdated Show resolved Hide resolved
content/en/docs/contribute/intermediate.md Outdated Show resolved Hide resolved
@zparnold
Copy link
Member

@aimeeu Did you have a chance to address the concerns?

@aimeeu
Copy link
Contributor Author

aimeeu commented Oct 15, 2019

@aimeeu Did you have a chance to address the concerns?

@zparnold - yes I believe I addressed Zach's request

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.

@aimeeu thanks once again for your work on this
I've got some more feedback; I hope it all makes sense.

content/en/docs/contribute/intermediate.md Outdated Show resolved Hide resolved
content/en/docs/contribute/intermediate.md Outdated Show resolved Hide resolved
content/en/docs/contribute/intermediate.md Outdated Show resolved Hide resolved
content/en/docs/contribute/intermediate.md Outdated Show resolved Hide resolved
content/en/docs/contribute/intermediate.md Outdated Show resolved Hide resolved
content/en/docs/contribute/intermediate.md Outdated Show resolved Hide resolved
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.

Happy to see this get merged.

Copy link
Contributor

@zacharysarah zacharysarah left a comment

Choose a reason for hiding this comment

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

@aimeeu Thanks for this, it's helpful! ✨

content/en/docs/contribute/intermediate.md Outdated Show resolved Hide resolved
content/en/docs/contribute/intermediate.md Outdated Show resolved Hide resolved
content/en/docs/contribute/intermediate.md Outdated Show resolved Hide resolved
content/en/docs/contribute/intermediate.md Outdated Show resolved Hide resolved
content/en/docs/contribute/intermediate.md Outdated Show resolved Hide resolved
content/en/docs/contribute/intermediate.md Show resolved Hide resolved
content/en/docs/contribute/intermediate.md Outdated Show resolved Hide resolved
content/en/docs/contribute/intermediate.md Outdated Show resolved Hide resolved
content/en/docs/contribute/intermediate.md Outdated Show resolved Hide resolved
@zparnold
Copy link
Member

@aimeeu Could you fix the merge conflicts when you have a chance please?

@aimeeu
Copy link
Contributor Author

aimeeu commented Oct 23, 2019

@zparnold I will try - I always seem to encounter trouble when rebasing a PR. :(

@aimeeu
Copy link
Contributor Author

aimeeu commented Oct 24, 2019

@zparnold - rebase success!

Add content based on Slack thread
https://kubernetes.slack.com/archives/C1TU9EB9S/p1570736679005700

Change -f to --force-with-lease
Simplified wording

Signed-off-by: Aimee Ukasick <[email protected]>
@aimeeu
Copy link
Contributor Author

aimeeu commented Oct 25, 2019

@zparnold - successfully rebased and addressed Zach's comments. I think this is finally ready to be approved!

@sftim
Copy link
Contributor

sftim commented Oct 27, 2019

Happy to see this get merged.

@zacharysarah
Copy link
Contributor

/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 Oct 27, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: zacharysarah

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 Oct 27, 2019
@k8s-ci-robot k8s-ci-robot merged commit 99895de into kubernetes:master Oct 27, 2019
@aimeeu aimeeu deleted the aimeeu-15878-contribIntermediate branch November 18, 2019 20:06
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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
6 participants