Approved: 2026-05-08 daily-coding-audit Q3 (option A).

What needs to happen

Five branches in sail-litify have been diverged from main for 13–20 days. Two are 10+ commits ahead. Rebase cost is climbing daily.

Branch Ahead of main Last commit Action
codex/intake-email-confirmation-2026-04-24 14 13d ago Rebase or merge first — highest investment
codex/litify-priority-tracker-2026-04-25 10 13d ago Rebase or merge second
codex/roundtable-qa-2026-04-25 3 13d ago Currently checked out; review and either merge or close
agent/hygiene-cleanup-2026-04-19 3 13d ago Likely superseded by other hygiene work; review and close if so
agent/projects-reorg-2026-04-18 1 20d ago Same projects-reorg branch exists in 4 other repos; check if it merged anywhere and close consistently

Deliverables

  1. PRs (or fast-forward merges) for the two big ones.
  2. Closed-without-merge for the superseded ones, with a one-line note on the GitHub branch describing why.
  3. A BRANCH-POLICY.md in sail-litify that says: max 7 days off main, must have a tracking issue, must rebase weekly.
  4. Skill update: daily-coding-audit auto-flags any litify branch >7 days old.

Ready-to-paste prompt for the next session

Run sail-litify branch triage. Read this Notion entry for context. For each of the 5 listed branches: open a session, view the commits, decide merge/close/keep. For codex/intake-email-confirmation-2026-04-24 and codex/litify-priority-tracker-2026-04-25 specifically: rebase against main, resolve conflicts, open PR. After all 5 are resolved, write sail-litify/BRANCH-POLICY.md and update the daily-coding-audit skill to flag litify branches >7 days. Update this Notion entry to QA: Clean when done.

Source