From 2840523ae4829984a9b163876351ab5b5a3e3dfc Mon Sep 17 00:00:00 2001 From: Dave Rodgman Date: Wed, 7 Feb 2024 10:42:22 +0000 Subject: [PATCH 1/3] Remind contributors not to force-push Signed-off-by: Dave Rodgman --- .github/pull_request_template.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index a07e8abd13..586536c0c9 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -18,3 +18,10 @@ Please tick as appropriate and edit the reasons (e.g.: "backport: not needed bec Please refer to the [contributing guidelines](https://github.com/Mbed-TLS/mbedtls/blob/development/CONTRIBUTING.md), especially the checklist for PR contributors. + +Help make review efficient: +* Multiple simple commits + - please structure your PR into a series of small commits, each of which does one thing +* No force-push + - please do not force-push to update your PR - just add new commit(s) + - use `git merge` (or the GitHub web interface) to resolve conflicts - not `git rebase` From c1a4d1f09a93d25f3037a3d56afaff3990811d94 Mon Sep 17 00:00:00 2001 From: Dave Rodgman Date: Wed, 7 Feb 2024 11:04:14 +0000 Subject: [PATCH 2/3] Remove comments about rebasing vs merging; link to longer RTD document Signed-off-by: Dave Rodgman --- .github/pull_request_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 586536c0c9..55b5964b51 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -24,4 +24,4 @@ Help make review efficient: - please structure your PR into a series of small commits, each of which does one thing * No force-push - please do not force-push to update your PR - just add new commit(s) - - use `git merge` (or the GitHub web interface) to resolve conflicts - not `git rebase` +* See our [Guidelines for Contributors](https://mbed-tls.readthedocs.io/en/latest/reviews/review-for-contributors/) for more details about the review process. From 2a6593bbb628d72a1c5be18c254ecff6e4f3961c Mon Sep 17 00:00:00 2001 From: Dave Rodgman Date: Wed, 7 Feb 2024 11:05:47 +0000 Subject: [PATCH 3/3] Slightly soften force-push suggestion Signed-off-by: Dave Rodgman --- .github/pull_request_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 55b5964b51..9d30412fd8 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -22,6 +22,6 @@ checklist for PR contributors. Help make review efficient: * Multiple simple commits - please structure your PR into a series of small commits, each of which does one thing -* No force-push +* Avoid force-push - please do not force-push to update your PR - just add new commit(s) * See our [Guidelines for Contributors](https://mbed-tls.readthedocs.io/en/latest/reviews/review-for-contributors/) for more details about the review process.