Skip to content
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

Jump to bottom

doc: reduce likelihood of mismerges during release #45864

Merged
merged 1 commit into from Dec 16, 2022
Merged

doc: reduce likelihood of mismerges during release #45864

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/contributing/releases.md
View file
Open in desktop
Expand Up @@ -710,7 +710,7 @@ repository.
```console
$ git checkout main
$ git pull upstream main
$ git cherry-pick v1.x^
$ git cherry-pick --strategy-option=diff-algorithm=patience v1.x^
```

Git should stop to let you fix conflicts.
Expand Down