Skip to content

Backmerge R2 and 2.6.3 release baseline into sprint - #7029

Closed
antuz123 wants to merge 12 commits into
sprintfrom
release/2.6.3
Closed

antuz123 wants to merge 12 commits into
sprintfrom
release/2.6.3

Conversation

@antuz123

@antuz123 antuz123 commented Oct 7, 2026

Copy link
Copy Markdown
Collaborator

Purpose

Bring the existing release line back into the shared sprint integration branch. release/2.6.3 descends from release/2.6.2, so this single PR carries the already committed 2.5.15–2.6.3 release baseline, including R2, without replaying it in separate PRs.

Scope

  • Backmerge the exact existing release commits into sprint; no new source changes are authored here.
  • Include the prior R2 backup/timelock commits and the 2.6.3 live pairing-channel/version and CI commits.
  • Keep the unfinished R3 keypad and backup verification fixes in their separate draft PRs until their validation is complete.
  • Leave dev and main untouched; normal promotion can follow review of the integrated release line.

Verification and review

  • sprint is an ancestor of release/2.6.3 at PR creation; the comparison is a straight 12-commit advance with no sprint-only commits.
  • git diff --check origin/sprint...origin/release/2.6.3 passes.
  • Release-branch test CI passed for the most recent CI repair PR Enable release/2.6.3 tests and repair recovery fixture #7028. This PR's sprint CI and maintainer review must complete before merging.

This corrects the branch-flow divergence identified during R3. It does not publish an app build or deploy backend changes.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant