Merge release back to main #85
Closed
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
Merge main to release/preview/v1
Merge main to release/preview/v1
Merge main to release/stable/v1
|
There are a lot of extra merge commits in release branch which don't need to go into main branch. I think it's okay to skip merging all these commits into main branch to make it even with release branch. Going forward, we can bump the version directly in main branch and then merge to release. IMO, it's okay if the branches are not even at this time. |
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.
To make the two branches "even".
In the future the version bumping is also against main branch. And we don't directly commit into release branch.
NOTE: merge this PR with a merge commit.