Skip to content

chore: sync main to dev before repair wave #476

Description

@LeXwDeX

Why

The approved repair wave for #472-#475 must follow the repository rule that delivery branches start from main, while the current main and dev histories have diverged after the v1.0.36 promotion and v1.0.37-dev.1 prerelease. Starting four repair branches before restoring ancestry would make PRs to dev carry unrelated main-side history or require an explicit branch-policy exception.

Scope

Synchronize the current main history into dev through the normal PR gates before any repair branch is created. Do not change product behavior, tests, CI policy, release mechanics, or the four repair issues.

Approach

Create the delivery from the fetched origin/main snapshot, target dev, preserve any dev-only commits, and verify the resulting merge base makes origin/main an ancestor of the updated dev.

Acceptance criteria

Blocked by

None - can start immediately.

Activity

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

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions