Skip to content

fix(bug) Removing git management labels#2346

Closed
DottsGit wants to merge 1 commit intoNousResearch:mainfrom
DottsGit:patch-1
Closed

fix(bug) Removing git management labels#2346
DottsGit wants to merge 1 commit intoNousResearch:mainfrom
DottsGit:patch-1

Conversation

@DottsGit
Copy link

@DottsGit DottsGit commented Mar 21, 2026

removing git management labels that an agent must have put directly into code

What does this PR do?

Related Issue

Fixes #

Type of Change

  • 🐛 Bug fix (non-breaking change that fixes an issue)
  • ✨ New feature (non-breaking change that adds functionality)
  • 🔒 Security fix
  • 📝 Documentation update
  • ✅ Tests (adding or improving test coverage)
  • ♻️ Refactor (no behavior change)
  • 🎯 New skill (bundled or hub)

Changes Made

  • Removes 3 lines that appear to be direct text from a merge conflict put into the python code

How to Test

Checklist

Code

  • I've read the Contributing Guide
  • My commit messages follow Conventional Commits (fix(scope):, feat(scope):, etc.)
  • I searched for existing PRs to make sure this isn't a duplicate
  • My PR contains only changes related to this fix/feature (no unrelated commits)
  • I've run pytest tests/ -q and all tests pass
  • I've added tests for my changes (required for bug fixes, strongly encouraged for features)
  • I've tested on my platform:

Documentation & Housekeeping

  • I've updated relevant documentation (README, docs/, docstrings) — or N/A
  • I've updated cli-config.yaml.example if I added/changed config keys — or N/A
  • I've updated CONTRIBUTING.md or AGENTS.md if I changed architecture or workflows — or N/A
  • I've considered cross-platform impact (Windows, macOS) per the compatibility guide — or N/A
  • I've updated tool descriptions/schemas if I changed tool behavior — or N/A

For New Skills

  • This skill is broadly useful to most users (if bundled) — see Contributing Guide
  • SKILL.md follows the standard format (frontmatter, trigger conditions, steps, pitfalls)
  • No external dependencies that aren't already available (prefer stdlib, curl, existing Hermes tools)
  • I've tested the skill end-to-end: hermes --toolsets skills -q "Use the X skill to do Y"

Screenshots / Logs

removing git management labels that an agent must have put directly into code
@DottsGit DottsGit changed the title Removing git management labels fix(bug) Removing git management labels Mar 21, 2026
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.
@aotarola
Copy link

aotarola commented Mar 21, 2026

any plans to put better CI controls to avoid this from happening in the future?

@DottsGit
Copy link
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

teknium1 added a commit that referenced this pull request Mar 21, 2026
Reverts the s-enter and Kitty CSI keybindings from PR #2345/#2346.
The s-enter key notation causes 'Invalid key: s-enter' crash on
some prompt_toolkit versions, breaking hermes startup entirely.
@DottsGit DottsGit closed this Mar 21, 2026
@DottsGit DottsGit deleted the patch-1 branch March 21, 2026 17:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants