Skip to content

chore: sync main back into staging (drift after bf9a4c0c) #770

@github-actions

Description

@github-actions

1 commit(s) in main are not in staging's ancestry after push to main at bf9a4c0.

This drift will cause conflicts on the next staging → main promotion.

Required action

  1. Create a chore/sync-main-to-staging branch from origin/staging
  2. git merge origin/main -X ours --no-edit (prefer staging for any conflicts)
  3. PR the branch into staging, merge, redeploy staging
  4. Close this issue

Auto-opened by the detect-staging-drift workflow.

Metadata

Metadata

Assignees

No one assigned

    Labels

    in-progressIssue currently being implementedstaging-driftmain has commits not yet in staging

    Projects

    No projects

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions