Fix inter-branch merge workflow ResetToTargetPaths functionality#16395
Merged
Fix inter-branch merge workflow ResetToTargetPaths functionality#16395
Conversation
- Configure git user (github-actions bot) before commits - Remove ls-tree check that doesn't work with wildcards - Create single commit for all reset patterns with comprehensive message Co-authored-by: mmitche <[email protected]>
- Remove extra quotes around pattern list - Add check to ensure patterns were processed before committing Co-authored-by: mmitche <[email protected]>
Copilot
AI
changed the title
[WIP] Fix issues in inter-branch merge workflow
Fix inter-branch merge workflow ResetToTargetPaths functionality
Dec 10, 2025
mmitche
reviewed
Dec 10, 2025
Each pattern now appears on its own line with a bullet point for better readability. Co-authored-by: mmitche <[email protected]>
mmitche
approved these changes
Dec 10, 2025
ViktorHofer
approved these changes
Dec 10, 2025
mmitche
approved these changes
Dec 12, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The
ResetToTargetPathsfeature in the inter-branch merge workflow had three issues: commits failed due to missing git identity,git ls-treedoesn't support wildcards/globs, and each pattern created a separate commit.Changes
github-actions[bot]user before committing to prevent authentication failuresgit ls-treecheck and usegit checkoutdirectly, which natively handles wildcards and glob patternsExample
With patterns
["*.txt", "docs/**/*.md"], the workflow now produces:Instead of two separate commits with individual pattern names.
To double check:
Original prompt
💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.