Skip to content

docs: improve "If You Sent to the Wrong Branch" #6659

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Oct 11, 2022
Merged

docs: improve "If You Sent to the Wrong Branch" #6659

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 4 additions & 16 deletions contributing/workflow.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <commit_id> <commit_id> <commit_id> ...
```

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.
Expand Down