Git Workflow

This is a Hermes-native git-workflow workflow skill.

Why This Exists

git-workflow exists because conflict resolution, bisect, and history repair had no owner: "resolve this merge conflict" reached a file operator and "clean up this branch's history" a live-information lane, while this repository's own incidents -- a stack that replayed its base commits, a commit landing on another session's branch -- each had a known correct procedure.

First Steps

• Name what is already pushed: each branch involved with its local head, its remote head, and whether others may have fetched it.
• Before any step that rewrites history, name its recovery point.

Do Not Use When

• The request is to write the commit message or the PR body for a finished change; use omh-commit-pr-authoring.
• The request is to find defects in a diff before merging it; use omh-code-review.
• The build or CI job fails and the question is why; use omh-build-failure-triage.
• The request is a code change to deliver rather than branch or history repair; use ulw-work.