diff --git a/contributing/workflow.md b/contributing/workflow.md index 4ea22cce5e22..921c49da1791 100644 --- a/contributing/workflow.md +++ b/contributing/workflow.md @@ -363,28 +363,16 @@ Update your `4.3` branch: > git push origin 4.3 ``` -Create a new branch `feat-ab.new` from the correct branch `4.3`: - -```console -> git switch -c feat-abc.new 4.3 -``` - -Cherry-pick the commits you did: - -```console -> git cherry-pick ... -``` - -Rename the PR branch `feat-abc`: +(Optional) Create a new branch as a backup, just in case: ```console -> git branch -m feat-abc feat-abc.old +> git branch feat-abc.bk feat-abc ``` -Rename the new branch `feat-abc.new` to `feat-abc`. +Rebase your PR branch from `develop` onto `4.3`: ```console -> git branch -m feat-abc.new feat-abc +> git rebase --onto 4.3 develop feat-abc ``` Force push.