Regenerate 2020 and 2024 tarfiles to resolve USDOT merge conflicts#3
Merged
payneBrandon merged 48 commits intodevelopfrom Mar 25, 2026
Merged
Conversation
… -fno-include-deps
Merge Release/2025 q2 into master
Sync master branch into develop
…ompound-names Fixes to generated J2735 from asn1c updates
This reverts commit 61771db.
…rfiles Cleanup Dockerfiles by removing unused asn1c instructions and comments
…ine builder images
…lation-duplication Optimize Docker build by introducing shared `runtime-deps` stage
…t-for-decoding-sdsm Add Unit Test for SDSM Data Decoding
Add release notes for 2025 Q3 release
Optimize Docker build, clean up J2735 code generation & add SDSM decoding test
Merge Release/2025 q3 into master
Update develop from master (2025-q3)
…nflicts-3-25-2026 # Conflicts: # asn1c_combined/generated-files/2020.tar.gz # asn1c_combined/generated-files/2024.tar.gz
dmccoystephenson
changed the title
payneBrandon
approved these changes
Mar 25, 2026
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
5 participants
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
This PR resolves merge conflicts that occurred when integrating changes from the USDOT develop branch into Trihydro develop. The 2020 and 2024 tarfiles have been regenerated to address these conflicts.
Changes
2020.tar.gzand2024.tar.gzto resolve merge conflictsTesting
doIt.shscript completes successfully when targeting both2020.tar.gzand2024.tar.gzRelated
Resolves conflicts in usdot-jpo-ode#77