Skip to content

fix(update): reconcile feature tracking refs - #54

Merged
epodivilov merged 2 commits into
mainfrom
fix/wtk-70-reconcile-tracking-refs
Sep 16, 2026
Merged

epodivilov merged 2 commits into
mainfrom
fix/wtk-70-reconcile-tracking-refs

Conversation

@epodivilov

Copy link
Copy Markdown
Owner

Summary

  • reconcile targeted active feature worktrees with each branch-specific tracking ref before root sync
  • fast-forward remote-only advances and conservatively realign patch-equivalent remote rewrites with recovery refs
  • add interactive and non-interactive policies for genuine divergence, dirty guards, dry-run reporting, and failure propagation
  • recompute the parent graph after reconciliation and preserve dependency-aware scheduling and hook ordering

Verification

  • pnpm lint
  • pnpm typecheck
  • pnpm test (710 tests)
  • pnpm build
  • git diff --check

Vikunja: WTK-70

@epodivilov
epodivilov marked this pull request as ready for review September 16, 2026 11:57
@epodivilov
epodivilov force-pushed the fix/wtk-70-reconcile-tracking-refs branch from b034554 to 567a7db Compare September 16, 2026 12:57
@epodivilov
epodivilov merged commit 30a12f6 into main Sep 16, 2026
1 check passed
@epodivilov
epodivilov deleted the fix/wtk-70-reconcile-tracking-refs branch September 16, 2026 12:58
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