Merge main branch into 1.6.x
#1272
Merged
Conversation
This file contains 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
`composer.json`'s branch alias for 1.6.x points to 1.4.x-dev version. Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
ghostwriter
added
Patch
Codecov Report
❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more. Additional details and impacted files@@ Coverage Diff @@
## 1.6.x #1272 +/- ##
============================================
+ Coverage 77.34% 77.71% +0.37%
- Complexity 993 996 +3
============================================
Files 74 74
Lines 2520 2526 +6
============================================
+ Hits 1949 1963 +14
+ Misses 571 563 -8 |
This was referenced Jun 6, 2023
Merged
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.
This pull request addresses the need to correctly rebase the
mainbranch into the1.6.xbranch prior to merging1.6.xback intomain.Currently, the default branch
mainand the1.6.xbranch have diverged due to various commits and changes. To ensure a clean and seamless merge, it is essential to rebase the default branch onto1.6.x, allowing the changes in themainbranch to be incorporated into the1.6.xbranch while maintaining a linear commit history.