Skip to content

upstream-sync 2026-10-05: merge conflicts need manual resolution #4836

Closed as not planned
Closed as not planned
upstream-sync 2026-10-05: merge conflicts need manual resolution#4836
Labels
triage-out-of-scopeVerdict: won't land in core — invalid, duplicate, off-mission, or redirected to an extension

Description

@Theralley
Theralley
opened on Oct 5, 2026

Merging upstream/main (ae5ade7234be5cb1d975f736c4e06dd46d1326d6, 814 new commits)
into main produced conflicts.

Resolve manually per docs/ant/upstream-sync.md §§1–2 (sentinel
rules), then push the sync branch and open the PR yourself.

Activity

  1. mnriem
    added
    triage-out-of-scopeVerdict: won't land in core — invalid, duplicate, off-mission, or redirected to an extension
    on Oct 5, 2026

  2. mnriem commented on Oct 5, 2026

    @mnriem
    mnriem
    on Oct 5, 2026
    Collaborator

    This appears to be spam

  3. mnriem
    closed this as not plannedon Oct 5, 2026
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

    triage-out-of-scopeVerdict: won't land in core — invalid, duplicate, off-mission, or redirected to an extension

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions