Skip to content

screenpipe fork: custom/linux-timeline-stability needs manual conflict resolution #345

Description

@github-actions

custom/linux-timeline-stability no longer rebases cleanly onto upstream/main (16 commits behind).

The fork was left untouched. Resolve it locally:

cd untracked/screenpipe && SYNC_BRANCH=custom/linux-timeline-stability ./sync-fork.sh
# fix conflicts, then: git add <files> && git rebase --continue
SYNC_BRANCH=custom/linux-timeline-stability ./sync-fork.sh --push

Run: https://github.com/SimpleOpenSoftware/chronicle/actions/runs/30428495695

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions