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

Activity

1. github-actions commented on Jul 30, 2026

   

   github-actionsbot

   on Jul 30, 2026 – with GitHub Actions

   Author

   More actions

   custom/linux-timeline-stability no longer rebases cleanly onto upstream/main (79 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/30519749647
2. github-actions commented on Jul 31, 2026

   

   github-actionsbot

   on Jul 31, 2026 – with GitHub Actions

   Author

   More actions

   custom/linux-timeline-stability no longer rebases cleanly onto upstream/main (198 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/30610699381
3. github-actions commented on Jul 31, 2026

   

   github-actionsbot

   on Jul 31, 2026 – with GitHub Actions

   Author

   More actions

   custom/linux-timeline-stability no longer rebases cleanly onto upstream/main (198 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/30610748326
4. github-actions commented on Aug 1, 2026

   

   github-actionsbot

   on Aug 1, 2026 – with GitHub Actions

   Author

   More actions

   custom/linux-timeline-stability no longer rebases cleanly onto upstream/main (281 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/30687875537
5. github-actions commented on Aug 2, 2026

   

   github-actionsbot

   on Aug 2, 2026 – with GitHub Actions

   Author

   More actions

   custom/linux-timeline-stability no longer rebases cleanly onto upstream/main (349 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/30736162057