Skip to content

Commit

Permalink
doc: reduce likelihood of mismerges during release
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
richardlau authored and targos committed Jan 1, 2023
1 parent c9747f1 commit d500445
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion doc/contributing/releases.md
Original file line number Diff line number Diff line change
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

0 comments on commit d500445

Please sign in to comment.