Skip to content

fix(update): automate semantic reconciliation - #57

Merged
epodivilov merged 4 commits into
mainfrom
fix/wtk-72-automatic-update-reconciliation
Sep 20, 2026
Merged

epodivilov merged 4 commits into
mainfrom
fix/wtk-72-automatic-update-reconciliation

Conversation

@epodivilov

Copy link
Copy Markdown
Owner

What

  • classify diverged feature tracking refs by patch-equivalent commits in both directions
  • preserve stale local rebases, automatically reconcile semantic remote work, and keep reset explicit
  • report only actionable reconciliation rows by default, add verbose diagnostics, actionable unresolved summaries, and phase-aware progress

Why

wt update must handle rebased-but-unpushed PR branches without prompt storms, unnecessary resets, or opaque unresolved failures.

Verification

  • bun test (714 passing; executed via pnpm dlx bun because Bun is not installed globally)
  • bun run typecheck
  • bun run lint

Not verified: manual update against a real repository with rebased-but-unpushed PR branches.

@epodivilov
epodivilov marked this pull request as ready for review September 19, 2026 23:28
@epodivilov
epodivilov merged commit 0481c2c into main Sep 20, 2026
1 check passed
@epodivilov
epodivilov deleted the fix/wtk-72-automatic-update-reconciliation branch September 20, 2026 09:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant