Issue Station
Sign In
Tools hereToolbox

hermes - 💡(How to fix) Fix Feature Request: github-advanced-git skill — rebase, resolve conflicts, stash

Official PRs (…)
ON THIS PAGE

Recommended Tools

×6

Utilities matched from this issue’s tags and category — try them while you read without losing context.

GitHub issue graph ai analysis

Paste a GitHub issue URL. We fetch that issue, discover linked issues from bodies/comments/timeline, collect linked pull requests, and produce a structured English report.

The report is written in English Markdown for sharing and archival.

Helpful · Quick feedback

Loading…

Error Message

  • Manual git commands via terminal — error-prone, no guardrails
RAW_BUFFERClick to expand / collapse

Feature Description

A skill for advanced git operations: rebase, conflict resolution, cherry-pick, stash management, bisect.

Motivation

Current github-pr-workflow covers branch → commit → open → merge. It breaks the moment:

  • A merge conflict appears and needs resolution
  • A feature branch needs rebasing onto main
  • A fix needs cherry-picking to a release branch
  • Multiple stashes need organizing or applying
  • A regression needs bisecting to find the offending commit

For solo founders and agent-driven workflows, these are daily realities. The existing skill says "merge" but offers no path when Git rejects the merge.

Proposed Solution

  • git rebase interactive and non-interactive with conflict detection
  • git cherry-pick with conflict recovery
  • git stash push/list/apply/drop/pop
  • git bisect automation (binary search with test command)
  • Conflict resolution: read conflict markers, present both sides, apply fix
  • git reflog for recovery from bad operations

Alternatives Considered

  • Extend github-pr-workflow — would bloat the basic PR flow
  • Manual git commands via terminal — error-prone, no guardrails

Vote matrix · Quick signals

Works
Did the solution work? Tap to confirm.
Easy Fix
Was it a quick fix?
Time Saver
Did it save you time?
Blocking
Was it severely blocking?
Common Issue
Are others likely hitting this too?
Flaky / Intermittent
Is it intermittent?
Verified / Reproducible
Can you reproduce it reliably?
Loading…
#model loading#dependency error#configuration error#environment variable#network issue

Still need to ship something?

×6

Another batch ranked right after the header list — different links, same matching logic.

Back to top recommendations

TRENDING

hermes - 💡(How to fix) Fix Feature Request: github-advanced-git skill — rebase, resolve conflicts, stash