Repository navigation
chore: backmerge master to develop - #249
Closed
markbujehein wants to merge 5 commits into
Closed
markbujehein wants to merge 5 commits into
markbujehein wants to merge 5 commits into
Conversation
Contributor
|
Label error. Requires at least 1 of: [bot] release, [scope] bug, [scope] documentation, [scope] enhancement, [scope] maintenance, [scope] significant. Found: |
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.
Context
This PR backmerges the current state of
masterintodevelop.As noted in #245 , four commits were accidentally merged into
master. Per @rozyczko's request to backmerge and clean up, this PR serves as step one: integrating those feature commits intodevelop.The merge only had one conflict (
docs/docs/user-guide/concept.md).Next Steps
Because I am working from a fork and do not have direct push access to perform a
git resetonmaster, I will open a subsequent PR to revertmasterfrom32a0180back to92dd2ed.