From 144cf15315d1009cd1c01fd75cf9a209e3dbaedb Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Wed, 26 Apr 2023 10:46:24 +0200 Subject: [PATCH] docs(contributing): rewrite do not force push section (#21812) --- .github/contributing.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/contributing.md b/.github/contributing.md index e04325a2f3..decea2ffbb 100644 --- a/.github/contributing.md +++ b/.github/contributing.md @@ -40,12 +40,13 @@ This makes it harder for us to review your work because we don't know what has c PRs will always be squashed by us when we merge your work. Commit as many times as you need in your pull request branch. -If you are updating your PR branch from within the GitHub PR interface, then only use the default "Update branch" button. +If you're updating your PR branch from within the GitHub PR interface, use the default "Update branch" button. +This is the "Update with merge commit" option in the dropdown. -Force pushing a PR is OK when: +Force pushing a PR, or using the "Update with rebase" button is OK when you: -- you need to make large changes on a PR which require a full review anyway -- you need to bring the branch up-to-date with the target branch and incorporating the changes is more work than to create a new PR +- make large changes on a PR which require a full review anyway +- bring the branch up-to-date with the target branch and incorporating the changes is more work than to create a new PR ## Apply maintainer provided review suggestions -- GitLab