fix: resolve merge conflict markers in cli.py breaking hermes startup#2347
Merged
fix: resolve merge conflict markers in cli.py breaking hermes startup#2347
Conversation
PR #2346 was merged with unresolved git conflict markers (<<<<<<, =======, >>>>>>>) in cli.py at line 6047, causing SyntaxError on startup. Resolved by keeping both the Shift+Enter keybindings and the tab handler.
|
PR #2346 was not merged but can now be closed as this resolved the issue |
23 tasks
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
2 participants
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.
URGENT — PR #2346 was merged with unresolved git conflict markers in cli.py line 6047, causing
SyntaxError: invalid syntaxon startup for anyone who updates.Resolved by keeping both sides: Shift+Enter keybindings + tab handler.