-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Closed
Labels
area-rebase-editorIssues or features related to the Interactive Rebase EditorIssues or features related to the Interactive Rebase Editorpending-releaseResolved but not yet released to the stable editionResolved but not yet released to the stable editionverified ✔VerifiedVerified
Milestone
Description
Summary
Improves cherry-pick apply to ensure commits are applied in correct topological order, preventing issues with stacked commits
Impact
Users cherry-picking multiple commits or stacks will now have commits applied in the correct dependency order, avoiding conflicts and ensuring proper commit ancestry.
Validation
- Create a stack of dependent commits (e.g., feature branch with 3+ commits)
- Cherry-pick the entire stack to another branch
- Verify commits are applied in correct topological order
- Verify no unexpected conflicts arise from incorrect ordering
Risk
Medium - Changes core cherry-pick application logic, but uses Git's topological ordering which is well-tested
Follow Ups
None
Closed by 4c99175
Reactions are currently unavailable
Metadata
Metadata
Assignees
Labels
area-rebase-editorIssues or features related to the Interactive Rebase EditorIssues or features related to the Interactive Rebase Editorpending-releaseResolved but not yet released to the stable editionResolved but not yet released to the stable editionverified ✔VerifiedVerified