chore: reconcile main into v4_development (ancestry merge)#1009
Merged
Conversation
… prevent saveCredentials() crash
…S1-OAEP-key-migration-to-prevent-saveCredentials-crash
…saveCredentials() crash (#924)
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…background interaction
…sabled packages and add test for adjustable height
… side sheet options
…for boundary conditions
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Prince Mathew <17837162+pmathew92@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: defaults Review profile: CHILL Plan: Pro Plus Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
…ty pins from main
utkrishtsahu
approved these changes
Jul 8, 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
Records
mainas a merged ancestor ofv4_developmentusing an-s oursmerge, so that the v4 → main release PR (#1008) becomes conflict-free. The v4 tree is unchanged — this commit is byte-for-byte identical tov4_developmentHEAD.Why
mainhad advanced 72 commits since the v4 fork point. Every feature in those commits was already re-implemented on v4's restructured code (verified by a full source + doc parity audit), so a normal merge produced 34 conflicts that were purely git-history artifacts. Rather than re-resolve restructured code by hand (risking flattening v4 back to v3 shapes), this usesgit merge -s oursto record the ancestry while keeping v4's tree exactly as-is.Verification
v4_developmentHEAD +origin/maintip.git diff HEAD origin/v4_development= empty (tree identical; v4 restructuring fully preserved).