Skip to content

Detect open parent drift during sync - #61

Merged
brdv merged 3 commits into
mainfrom
detect-open-parent-drift
Jul 24, 2026
Merged

brdv merged 3 commits into
mainfrom
detect-open-parent-drift

Conversation

@brdv

@brdv brdv commented Jul 24, 2026

Copy link
Copy Markdown
Owner

Summary

Fixes #44 by making stck sync check every effective open parent→child edge with Git ancestry, even when PR base names already match.

When the first drifted child is found, sync rewrites it and cascades through its descendants while preserving local-only sync behavior and exact sync-time push leases.

Changelist

  • Detect fetched parent/local child ancestry drift in both sync and status.
  • Generalize sync planning to force rewrites from a non-first open branch.
  • Add planner, status, reset, and real-Git sync/push regressions for advanced open parents.

@brdv brdv self-assigned this Jul 24, 2026
@brdv
brdv merged commit f8e26ec into main Jul 24, 2026
2 checks passed
@brdv
brdv deleted the detect-open-parent-drift branch July 24, 2026 12: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.

stck sync doesn't detect local branch divergence

1 participant