doc: reduce likelihood of mismerges during release #45864
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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)
|
Review requested:
|
BridgeAR
approved these changes
Dec 14, 2022
targos
approved these changes
Dec 15, 2022
RafaelGSS
approved these changes
Dec 16, 2022
aduh95
added
author ready
nodejs-github-bot
removed
the
commit-queue
|
Landed in 6fe6e76 |
targos
pushed a commit
that referenced
this pull request
Jan 1, 2023
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>
Merged
juanarbol
pushed a commit
that referenced
this pull request
Jan 26, 2023
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>
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Switch to the
patiencegit diff algorithm to reduce the likelihood of mismerges when the release commit is cherry-picked to themainbranch.Refs: nodejs/Release#771 (comment)
cc @nodejs/releasers