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
custom/linux-timeline-stabilityno longer rebases cleanly ontoupstream/main(16 commits behind).The fork was left untouched. Resolve it locally:
Run: https://github.com/SimpleOpenSoftware/chronicle/actions/runs/30428495695