20.04 support: Merge cherry-picks from develop #108
Merged
Conversation
This file contains hidden or 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
Collaborator
shishirb-MSFT
commented
Jan 7, 2022
shishirb-MSFT
commented
- Instead of cherry-picks that can cause conflicts later, or worse, ignored changes, created a patch branch from a common ancestor (git merge-base main develop) and cherry-picked changes onto this branch instead.
- This patch branch will then be merged to develop and main.
* With creation of develop, main will not see frequent changes. * main can be covered by the release pipeline alone.
* Ensure user provided generator if used
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.