Skip to content

Conversation

@javoire
Copy link
Owner

@javoire javoire commented Dec 1, 2025

When stack sync encounters a rebase conflict, the stash is now preserved and users are instructed to run stack sync --resume after resolving conflicts.

Changes

  • Add --resume flag to continue sync after resolving rebase conflicts
  • Save sync state (stashed status, original branch) to git config
  • Don't pop stash on rebase conflicts - wait for --resume
  • Improved error message with step-by-step instructions
  • Validation for orphaned sync state and missing resume state

Workflow

  1. User runs stack sync with uncommitted changes
  2. Changes are stashed
  3. Rebase conflict occurs
  4. User resolves conflicts, runs git rebase --continue
  5. User runs stack sync --resume
  6. Sync completes and stash is popped

Base automatically changed from fix/detect-local-remote-divergence to main December 1, 2025 20:46
@javoire javoire enabled auto-merge December 1, 2025 20:47
@javoire javoire disabled auto-merge December 1, 2025 22:10
@javoire javoire enabled auto-merge December 1, 2025 22:15
@javoire javoire merged commit 4312218 into main Dec 1, 2025
1 check passed
@javoire javoire deleted the feat/sync-resume branch December 1, 2025 22:16
@javoire
Copy link
Owner Author

javoire commented Dec 1, 2025

🎉 This PR is included in version 1.2.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants