Repository navigation
chore: bring the v0.2.0 merge commits back to develop - #51
Merged
Merged
Conversation
chore: release v0.1.0
chore: release v0.1.0
chore: release 0.2.0
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
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.
What and why
mainholds the merge commits of #27, #39 and #50, whichdeveloplacks. This brings them back so the two branches share history again, as #40 did after v0.1.0.How to review
No file changes are expected: only merge commits. The diff should be empty.
How to try it
git diff origin/develop origin/mainprints nothing.Does it earn its place?
Merge with a merge commit, not a squash. A squash would leave the merge commits missing again.