skills.rest
albertdobmeyer
albertdobmeyerCOMMUNITY
Explore all skills by this author →
WebsiteGitHub

git-workflows

Resolve advanced Git history, branching, and recovery problems.

2|1|Updated Mar 2, 2026
Search Tags:#git#worktree#monorepo#reflog#rebase#bisect#merge-conflicts
One-click install
npx skills add https://github.com/albertdobmeyer/opentrapp --skill git-workflows-albertdobmeyer
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflows
Source: https://github.com/albertdobmeyer/opentrapp/tree/main/workloads/skills/skills/git-workflows
Command: npx skills add https://github.com/albertdobmeyer/opentrapp --skill git-workflows-albertdobmeyer

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill helps you handle advanced Git situations that go beyond everyday add, commit, and push workflows, especially when history needs cleanup, bugs must be traced, or lost work must be recovered.

Core Features & Use Cases

  • History refinement: Reorder, squash, split, and rewrite commit history with interactive rebase.
  • Bug isolation and recovery: Use bisect, reflog, and stash techniques to find regressions and restore lost changes.
  • Parallel development: Work with worktrees, cherry-picks, submodules, subtrees, sparse checkout, and merge conflict resolution in complex repositories.
  • Use case: A team lead can clean up a feature branch before merge, isolate the commit that introduced a regression, and recover from an accidental hard reset without losing progress.

Quick Start

Ask the git-workflows skill to help you safely clean up a branch, debug a regression, or recover lost commits in your repository.

Frequently Asked Questions about git-workflows

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

FAQPage Schema
How do I recover lost commits after an accidental hard reset in git?▼

Recover lost commits after a hard reset by using git reflog to find the dangling commit hash and running git reset --hard to restore the branch pointer to that state.

What's the best way to squash and reorder commits before merging a feature branch?▼

Squash and reorder commits before merging by running an interactive rebase to rewrite history, allowing you to combine, split, or reorder commit messages safely.

How do I use git bisect to find which commit introduced a regression?▼

Use git bisect to find regressions by marking good and bad commits, letting git binary-search the history to automatically isolate the exact commit that introduced the bug.

Can I work on multiple branches simultaneously in the same monorepo without cloning again?▼

Work on multiple branches simultaneously in a monorepo by using git worktree to link separate working directories to the same repository, enabling parallel branch management.

How do I resolve complex merge conflicts in a monorepo with sparse checkout?▼

Resolve complex merge conflicts in a monorepo with sparse checkout by configuring the working directory to only include necessary files, then applying safe conflict resolution workflows.

When should I use cherry-picking instead of merging a branch?▼

Use cherry-picking instead of merging when you need to apply specific commits from one branch to another without pulling in the entire branch history and its unrelated changes.

Related Skills

Explore More Software Engineering Skills→
Tx1207Tx1207
5

project-creator

Create a new project from a template, initialize uv, and configure a local Git repository.

Community
Advanced
GGPromptsGGPrompts
147

merge

Merge feature branches into main and clean up worktrees using Git.

Community
Advanced
irahardiantoirahardianto
150

parallel-dispatch-merge

Merge parallel worktree branches into main using DAG-derived ordering.

Community
Advanced
bcastelinobcastelino
2

git-advanced-workflows

Guide advanced Git operations including interactive rebase, bisect, worktrees, and reflog.

Community
Advanced