-
Notifications
You must be signed in to change notification settings - Fork 14.5k
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
Intermediate Contributing Page: Update Work from a local clone section #16748
Conversation
Deploy preview for kubernetes-io-master-staging ready! Built with commit fd73d4d https://deploy-preview-16748--kubernetes-io-master-staging.netlify.com |
There was a problem hiding this 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.
There was a problem hiding this 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. ✨
@aimeeu Did you have a chance to address the concerns? |
There was a problem hiding this 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.
There was a problem hiding this 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.
There was a problem hiding this 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! ✨
@aimeeu Could you fix the merge conflicts when you have a chance please? |
@zparnold I will try - I always seem to encounter trouble when rebasing a PR. :( |
@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]>
@zparnold - successfully rebased and addressed Zach's comments. I think this is finally ready to be approved! |
Happy to see this get merged. |
/lgtm |
[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 |
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]