Skip to content

[sync] Rebase conflict syncing fork from upstream (2026-05-26) #64

@github-actions

Description

@github-actions

Auto-sync from upstream/main failed due to rebase conflicts.

Run id: 26432538409
Workflow: Sync fork from upstream

Resolve manually:

cd ~/EverOS && git fetch upstream && git rebase upstream/main
# resolve conflicts, then:
git push origin main --force-with-lease

Metadata

Metadata

Assignees

No one assigned

    Labels

    trackingIssue tracks a long-lived workflow

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions