Commit d500445
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 c9747f1 commit d500445
1 file changed
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -710,7 +710,7 @@ repository. | |||
| 710 | 710 | ```console | |
| 711 | 711 | $ git checkout main | |
| 712 | 712 | $ git pull upstream main | |
| 713 | - $ git cherry-pick v1.x^ | ||
| 713 | + $ git cherry-pick --strategy-option=diff-algorithm=patience v1.x^ | ||
| 714 | 714 | ``` | |
| 715 | 715 | ||
| 716 | 716 | Git should stop to let you fix conflicts. | |
0 commit comments