Sync main back to develop after 1.5.6 release - #304
Merged
Merged
Conversation
GaryJones
added
the
type: maintenance
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
1 participant
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.
Summary
Back-merge the 1.5.6 release commits from
mainintodevelop, per the standard release workflow. Brings across the three release commits (Version 1.5.6 changelog,Version 1.5.6 i18n,Version 1.5.6) and the merge commit from PR #303, so thatdevelopandmainagree on the released state.No code changes — just keeps the two branches in sync so the next change cut from
developdoesn't have to carry the release commits as a diff.Test plan
git log develop..mainandgit log main..develop(excluding any in-flight develop commits) confirm parity on the release commits