Skip to content

Conversation

@javoire
Copy link
Owner

@javoire javoire commented Dec 19, 2025

When stack sync detects a polluted branch (diverged history with duplicate commits), users can now run:

stack sync --cherry-pick

This will:

  1. Create a backup branch (<branch>-backup) for safety
  2. Cherry-pick only the unique commits onto the parent
  3. Replace the original branch with the clean version
  4. Continue with normal push

Also renames git methods for clarity:

  • CreateBranch → just creates branch (no checkout)
  • CreateBranchAndCheckout → creates and checks out

@javoire javoire merged commit 91f1860 into main Dec 19, 2025
1 check passed
@javoire javoire deleted the feat/cherry-pick-rebuild branch December 19, 2025 14:33
@javoire
Copy link
Owner Author

javoire commented Dec 19, 2025

🎉 This PR is included in version 1.6.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