diff options
| -rw-r--r-- | .github/PULL_REQUEST_TEMPLATE.md | 10 | ||||
| -rw-r--r-- | contributors/guide/contributor-cheatsheet/README.md | 5 |
2 files changed, 12 insertions, 3 deletions
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index d08b6fa4..f3a67564 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -4,4 +4,12 @@ You will need to follow these steps: 1. Edit sigs.yaml with your change 2. Generate docs with `make generate`. To build docs for one sig, run `make WHAT=sig-apps generate` --->
\ No newline at end of file +--> + +**Which issue(s) this PR fixes**: +<!-- +*Automatically closes linked issue when PR is merged. +Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`. +_If PR is about `failing-tests or flakes`, please post the related issues/tests in a comment and do not use `Fixes`_* +--> +Fixes # diff --git a/contributors/guide/contributor-cheatsheet/README.md b/contributors/guide/contributor-cheatsheet/README.md index b44e7a9b..ef99925b 100644 --- a/contributors/guide/contributor-cheatsheet/README.md +++ b/contributors/guide/contributor-cheatsheet/README.md @@ -332,12 +332,13 @@ remotes. #### Keeping Your Fork in Sync Fetch all the changes from `upstream` and _"rebase"_ them on your local `master` -branch. This will sync your local repo with the `upstream` project. +branch. This will sync your local repo with the `upstream` project. Push the local changes to your `remote master`. ``` git fetch upstream git checkout master git rebase upstream/master +git push ``` You should do this minimally before creating a new branch to work on your @@ -403,4 +404,4 @@ the other contributors assigned to review and approve your PR. [Security and Disclosure Information]: https://kubernetes.io/docs/reference/issues-security/security/ [approve]: https://prow.k8s.io/command-help#approve [GitHub Administration Team]: /github-management#github-administration-team -[Kubernetes Patch Release]: https://github.com/kubernetes/sig-release/blob/master/releases/patch-releases.md
\ No newline at end of file +[Kubernetes Patch Release]: https://github.com/kubernetes/sig-release/blob/master/releases/patch-releases.md |