screenpipe fork: chronicle needs manual conflict resolution

[github-actions]

chronicle no longer rebases cleanly onto upstream/main (267 commits behind).

The fork was left untouched. Resolve it locally:

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

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

[github-actions]

chronicle no longer rebases cleanly onto upstream/main (328 commits behind).

The fork was left untouched. Resolve it locally:

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

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

[github-actions]

chronicle no longer rebases cleanly onto upstream/main (399 commits behind).

The fork was left untouched. Resolve it locally:

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

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

[github-actions]

chronicle no longer rebases cleanly onto upstream/main (437 commits behind).

The fork was left untouched. Resolve it locally:

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

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

[github-actions]

chronicle no longer rebases cleanly onto upstream/main (507 commits behind).

The fork was left untouched. Resolve it locally:

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

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

[github-actions]

chronicle no longer rebases cleanly onto upstream/main (543 commits behind).

The fork was left untouched. Resolve it locally:

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

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

[github-actions]

chronicle no longer rebases cleanly onto upstream/main (583 commits behind).

The fork was left untouched. Resolve it locally:

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

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

[github-actions]

chronicle no longer rebases cleanly onto upstream/main (621 commits behind).

The fork was left untouched. Resolve it locally:

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

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

[github-actions]

chronicle no longer rebases cleanly onto upstream/main (655 commits behind).

The fork was left untouched. Resolve it locally:

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

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

[github-actions]

chronicle no longer rebases cleanly onto upstream/main (716 commits behind).

The fork was left untouched. Resolve it locally:

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

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

[github-actions]

chronicle no longer rebases cleanly onto upstream/main (773 commits behind).

The fork was left untouched. Resolve it locally:

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

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

[github-actions]

chronicle no longer rebases cleanly onto upstream/main (798 commits behind).

The fork was left untouched. Resolve it locally:

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

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

[github-actions]

chronicle no longer rebases cleanly onto upstream/main (805 commits behind).

The fork was left untouched. Resolve it locally:

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

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

[github-actions]

chronicle no longer rebases cleanly onto upstream/main (818 commits behind).

The fork was left untouched. Resolve it locally:

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

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

[github-actions]

chronicle no longer rebases cleanly onto upstream/main (833 commits behind).

The fork was left untouched. Resolve it locally:

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

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

[github-actions]

chronicle no longer rebases cleanly onto upstream/main (852 commits behind).

The fork was left untouched. Resolve it locally:

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

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