git merge conflict indicator error message#5974
Open
0xda157 wants to merge 4 commits into
Open
Conversation
0xda157
commented
Jul 15, 2026
Comment on lines
+957
to
+958
| "I don't know how to handle this", | ||
| vec!["Hint: resolve merge conflicts".into()], |
Contributor
Author
There was a problem hiding this comment.
I didn't really have any good ideas for the error message, suggestions would be appreciated.
Comment on lines
+412
to
+416
| <<<<", | ||
| ParseError { | ||
| error: ParseErrorType::UnexpectedEof, | ||
| location: SrcSpan { start: 0, end: 0 }, | ||
| } |
Contributor
Author
There was a problem hiding this comment.
for some reason GtGT provides a nice error message but LtLt provides this unhelpful message. any advice on this would be great.
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
1 participant
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.
Fixes #5906