skills.rest
kreek
kreekCOMMUNITY
Explore all skills by this author →
GitHub

git-workflow

Manages git branches, history rewrites, conflict resolution, and force-push safety gates.

1|Updated Apr 24, 2026
Search Tags:#git#github#branch management#merge conflicts#rebase#force push#reflog recovery
One-click install
npx skills add https://github.com/kreek/consult --skill git-workflow-kreek
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/kreek/consult/tree/main/plugin/skills/git-workflow
Command: npx skills add https://github.com/kreek/consult --skill git-workflow-kreek

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? Git operations like rebases, force pushes, and history rewrites can destroy work or corrupt shared branches when done carelessly. This Skill enforces recoverability checkpoints and human approval gates so destructive git operations never happen without a recovery point and explicit consent. ## Core Features & Use Cases - Safe History Operations: Inspects tree, branch, and upstream state before rebases, force pushes, or deletions, always naming a recovery point first. - Approval Gates for Published Text: Drafts PR and issue titles and bodies locally and requires user approval of the exact text before publishing via gh or GitHub MCP. - Conflict Resolution with Intent Preservation: Resolves merge conflicts by preserving intent from both sides, then verifies with range-diff and relevant checks. - Use Case: You need to force-push a rebased branch. The Skill verifies the branch is local or solo, confirms a recovery point, and applies --force-with-lease --force-if-includes instead of a blind force push. ## Quick Start Use the git-workflow skill to inspect my working tree and safely rebase this branch with a recovery point before any force push.

Frequently Asked Questions about git-workflow

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I safely force push a git branch?▼

Verify the branch is local or solo, name a recovery point such as a tag or reflog entry, then use --force-with-lease --force-if-includes. Shared branches require explicit approval before any history rewrite.

How to resolve git merge conflicts without losing work?▼

Resolve conflicts by preserving intent from both sides rather than blindly taking ours or theirs. Afterward run the relevant checks and verify with range-diff or log inspection that intended commits remain.

Can I recover a deleted branch or lost commit in git?▼

Yes, use the reflog to locate the lost commit and restore it via a tag or branch. This Skill requires naming a recovery point before any destructive operation so recovery is always possible.

What if gh CLI is not installed but I need GitHub access?▼

Check for a GitHub MCP server or host-provided tools, since gh is absent from some sandboxes. The host's permission system governs access regardless of which surface is used.

When should I not use this git workflow approach?▼

Do not use it for staging, splitting, or committing reviewed work, which belongs to a commit skill, or for CI failure triage, which belongs to debugging. It focuses on history operations and publishing gates.

Related Skills

Explore More Software Engineering Skills→
p-o-ke-naep-o-ke-nae

github-flow

Guide GitHub Flow branching, commits, testing, pull requests, and squash merges.

Community
Intermediate
pacaplanpacaplan
30

release

Create release pull requests with semantic version bumps and changelog entries.

Community
Advanced
ISAQQSAIISAQQSAI

git-advanced-workflows

Guide developers through rebasing, cherry-picking, bisect, worktrees, and reflog workflows.

Community
Advanced
librefanglibrefang
10

git-expert

Guide Git branching, rebasing, and conflict resolution workflows.

Official
Advanced