EdkRepo: f2f-cherry-pick will drop the top commit in some cases #28
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
In the case of f2f-cherry-pick needs to perform more than one cherry-pick operation to complete the f2f-cherry-pick, the final action edkrepo will perform is squashing the several cherry-picks down to one commit. This squash will erroneously drop the top commit on the target branch before performing the final cherry-pick. Signed-off-by: Nate DeSimone <[email protected]>
ashedesimone
approved these changes
Jul 28, 2021
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.
In the case of f2f-cherry-pick needs to perform more than one
cherry-pick operation to complete the f2f-cherry-pick, the
final action edkrepo will perform is squashing the several
cherry-picks down to one commit. This squash will erroneously
drop the top commit on the target branch before performing
the final cherry-pick.
Signed-off-by: Nate DeSimone [email protected]