Skip to content

Polish sync/new guidance and usage docs#18

Merged
brdv merged 1 commit intomainfrom
dogfood-iter4-ux-docs
Feb 11, 2026
Merged

Polish sync/new guidance and usage docs#18
brdv merged 1 commit intomainfrom
dogfood-iter4-ux-docs

Conversation

@brdv
Copy link
Owner

@brdv brdv commented Feb 11, 2026

Summary

Polish user guidance and docs for the newly added default-branch new flow and sync --reset recovery flow.

This keeps command behavior and user-facing instructions aligned, and makes recovery paths clearer without changing core sync/push mechanics.

Changelist

  • src/cli.rs
    • Improved sync state messaging:
      • resume message now points to stck sync --reset for explicit recompute
      • missing-state message for --continue now instructs to run stck sync to compute a plan
  • USAGE.md
    • Updated new section to document both:
      • stacked branch flow
      • starting from default branch
    • Documented explicit recovery options:
      • stck sync --continue
      • stck sync --reset
    • Updated no-commit behavior text to reflect printed follow-up command.
  • README.md
    • Added brief note that stck new <branch> works from default branch and stacked branches.
  • tests/cli_skeleton.rs
    • Updated assertion for revised sync --continue no-state message.

Validation

  • cargo fmt --all
  • cargo clippy --all-targets --all-features -- -D warnings
  • cargo test --all-features

Base automatically changed from sync-reset-flag to main February 11, 2026 11:10
@brdv brdv force-pushed the dogfood-iter4-ux-docs branch from e4fe054 to 0a8f232 Compare February 11, 2026 11:12
@brdv brdv merged commit 5b4ebdf into main Feb 11, 2026
1 check passed
@brdv brdv deleted the dogfood-iter4-ux-docs branch February 11, 2026 11:12
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