domains / families / software-engineering / git-advanced-workflows

git-advanced-workflows

combined

Master advanced Git workflows including rebasing, cherry-picking, bisect, worktrees, and reflog to maintain clean history and recover from any situation. Use when managing complex Git histories, collaborating on feature branches, or troubleshooting repository issues. Master advanced Git techniques to maintain clean history, collaborate effectively, and recover from any situation with confidence.

When to use

• Cleaning up commit history before merging
• Applying specific commits across branches
• Finding commits that introduced bugs
• Working on multiple features simultaneously
• Recovering from Git mistakes or lost commits
• Managing complex branch workflows
• Preparing clean PRs for review
• Synchronizing diverged branches

When not to use

• The task is unrelated to git advanced workflows
• You need a different domain or tool outside this scope
• Use this skill only when the task clearly matches the scope described above.
• Do not treat the output as a substitute for environment-specific validation, testing, or expert review.
• Stop and ask for clarification if required inputs, permissions, safety boundaries, or success criteria are missing.

Skill page

Conflict

The two copies share the same core Git techniques (rebase, cherry-pick, bisect, worktrees, reflog) and most practical workflows, but the sickn33 copy adds a distinct 'Repository and Recovery Boundary' section with safety constraints (branch protection, preserving dirty work, authorization for shared-history rewrites, reflog expiry limits) that the rmyndharis copy lacks. The sickn33 copy also modifies Workflow 2 to create an authorized topic branch from origin/main rather than committing directly to main, which is a material procedural difference. Crowning one copy would hide these safety constraints and the altered hotfix workflow.