Repository navigation
Conversation
Recognize current and legacy branch rename and revert conflict diagnostics, and staged or unstaged changes blocking rebase. Prioritize revert-specific advice over generic merge conflicts and cover real bundled Git failures alongside legacy and negative cases. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
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.
Summary
Update three error classifications while preserving legacy diagnostics:
git revert --no-commit.Revert-specific diagnostics take priority over generic merge-conflict output. Detection still requires conflict advice rather than treating every failed revert as a conflict.
Add 30 regression tests covering nine real bundled Git scenarios, legacy output, CRLF line endings, negative cases, and classification ordering. Document the supported behavior.
Validation