skills.rest
Sumeet138
Sumeet138COMMUNITY
Explore all skills by this author →
Website𝕏@SumitGond28GitHub

git-advanced-workflows

Guide interactive rebases, cherry-picking, bisecting, worktrees, and reflog across Git branches.

1|Updated Apr 14, 2026
Search Tags:#git#worktrees#reflog#cherry-pick#bisect#rebasing#git-workflows
One-click install
npx skills add https://github.com/Sumeet138/qwen-code-agents --skill git-advanced-workflows-sumeet138
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-advanced-workflows
Source: https://github.com/Sumeet138/qwen-code-agents/tree/main/plugins/developer-essentials/skills/git-advanced-workflows
Command: npx skills add https://github.com/Sumeet138/qwen-code-agents --skill git-advanced-workflows-sumeet138

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Cleaning and coordinating Git histories across multiple branches is error-prone and hard to audit. This Skill provides structured techniques for maintaining a clean history, coordinating rebases, selective commits, and multi-worktree strategies to keep repositories robust.

Core Features & Use Cases

  • Interactive rebase, cherry-picking, bisect, worktrees, and reflog techniques to manage history and debugging across branches.
  • Practical workflows include cleaning up feature branches before PRs, applying hotfixes to multiple releases, diagnosing bug introduction, multi-branch development, and recovery from mistakes.
  • Guidance for safe collaboration, descriptive commits, and guardrails for force-push scenarios.

Quick Start

Start by choosing a feature branch and performing an interactive rebase to clean up the last several commits, then push with --force-with-lease after resolving conflicts.

Frequently Asked Questions about git-advanced-workflows

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

FAQPage Schema
How do I clean up commits on a feature branch before a pull request?▼

Use interactive rebasing to squash or reorder commits on your feature branch, then push safely using --force-with-lease guardrails. This workflow keeps history clean and resolves conflicts before merging.

What's the best way to apply a hotfix across multiple release branches?▼

Apply hotfixes across multiple releases using cherry-picking to selectively transfer specific commits between branches. This maintains reliable collaboration without merging unrelated history.

How does git bisect help diagnose when a bug was introduced?▼

Git bisect diagnoses bug introduction by binary-searching through commits to pinpoint the exact change causing failure. This debugging workflow systematically narrows down history across branches.

Can I work on multiple branches simultaneously without stashing changes?▼

Use git worktrees to maintain separate working directories for multiple branches simultaneously. This multi-branch strategy eliminates stashing and enables parallel feature development.

How do I recover lost commits after a bad rebase or force push?▼

Recover lost commits after bad rebases or force pushes using git reflog to trace HEAD movements and restore previous states. This safe recovery workflow provides guardrails against history loss.

When should I use interactive rebase instead of a standard merge?▼

Use interactive rebase instead of standard merge when you need to clean up commit history by squashing, reordering, or editing commits before sharing. This keeps repositories robust and history auditable.

Related Skills

Explore More Software Engineering Skills→
mixomatmixomat

clean-gone-branches

Delete local git branches marked [gone] while skipping worktree branches.

Community
Intermediate
sori883sori883

github-workflow

Manage GitHub repositories, branches, commits, pull requests, and issues with Linear integration.

Community
Advanced
MayaDispelerMayaDispeler
3

git-workflow

Enforce git commit message formats, branch naming, and pull request guidelines.

Community
Advanced
FutureAtomsFutureAtoms
1

git-github-merge

Automates Git merge operations with selectable fast-forward, merge-commit, squash strategies and conflict previews.

Community
Intermediate