fix(bug) Removing git management labels#2346
Closed
DottsGit wants to merge 1 commit intoNousResearch:mainfrom
Closed
fix(bug) Removing git management labels#2346DottsGit wants to merge 1 commit intoNousResearch:mainfrom
DottsGit wants to merge 1 commit intoNousResearch:mainfrom
Conversation
removing git management labels that an agent must have put directly into code
teknium1
added a commit
that referenced
this pull request
Mar 21, 2026
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.
|
any plans to put better CI controls to avoid this from happening in the future? |
Author
|
This did not properly resolve the issue as it only removed the git label and not the entire "stashed" change. PR #2347 also removed the "stashed" change. This can be closed |
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.
removing git management labels that an agent must have put directly into code
What does this PR do?
Related Issue
Fixes #
Type of Change
Changes Made
How to Test
Checklist
Code
fix(scope):,feat(scope):, etc.)pytest tests/ -qand all tests passDocumentation & Housekeeping
docs/, docstrings) — or N/Acli-config.yaml.exampleif I added/changed config keys — or N/ACONTRIBUTING.mdorAGENTS.mdif I changed architecture or workflows — or N/AFor New Skills
hermes --toolsets skills -q "Use the X skill to do Y"Screenshots / Logs