Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 662f574

Browse filesBrowse files
richardlaujuanarbol
richardlau
authored and
juanarbol
committed
doc: reduce likelihood of mismerges during release
Switch to the `patience` git diff algorithm to reduce the likelihood of mismerges when the release commit is cherry-picked to the `main` branch. Refs: nodejs/Release#771 (comment) PR-URL: #45864 Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
1 parent 5fa6a70 commit 662f574
Copy full SHA for 662f574

File tree

Expand file treeCollapse file tree

1 file changed

+1
-1
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

1 file changed

+1
-1
lines changed
Open diff view settings
Collapse file

‎doc/contributing/releases.md‎

Copy file name to clipboardExpand all lines: doc/contributing/releases.md
+1-1Lines changed: 1 addition & 1 deletion
  • Display the source diff
  • Display the rich diff
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,7 @@ repository.
710710
```console
711711
$ git checkout main
712712
$ git pull upstream main
713-
$ git cherry-pick v1.x^
713+
$ git cherry-pick --strategy-option=diff-algorithm=patience v1.x^
714714
```
715715

716716
Git should stop to let you fix conflicts.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.