Merge sdf13 ➡️ main #1313
Merged
Merge sdf13 ➡️ main #1313
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
Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>
Codecov Report
@@ Coverage Diff @@
## main #1313 +/- ##
==========================================
+ Coverage 87.35% 87.42% +0.07%
==========================================
Files 133 133
Lines 17133 17295 +162
==========================================
+ Hits 14966 15121 +155
- Misses 2167 2174 +7
|
ahcorde
approved these changes
Aug 22, 2023
This addresses a bug where custom parsed models were not being processed if they happen to be nested two levels or more deep where one or more of those levels is also a merge-include. This was mainly because the include tags (which remain as include tags when they point to a custom parsed file) of a merge-included child model were not moved/merged into the parent model --------- Signed-off-by: Addisu Z. Taddese <[email protected]>
scpeters
force-pushed
the
scpeters/merge_13_main
branch
from
11b9681
to
88ddfa7
Compare
|
I just force-pushed to include #1293 |
azeey
approved these changes
Aug 23, 2023
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.
➡️ Forward port
Port
sdf13➡️mainBranch comparison: main...sdf13
Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)