git-advanced

This skill provides a robust framework for performing advanced Git operations within a high-integrity, rebase-first development environment. Designed for developers and AI agents managing linear git history, it enforces critical safety protocols to prevent common pitfalls such as force-pushing to protected branches, skipping pre-commit hooks, or disrupting shared team history. By integrating specific command-line procedures, this skill ensures that complex operations like interactive rebasing, automated regression testing via git bisect, and selective commit transplantation remain safe, traceable, and compliant with project-specific workflow standards.

• Automated Rebase-First Workflows: Standardizes fetching, rebasing on dev/main, and safe force-with-lease push operations to maintain linear history.

• Regression Analysis with Git Bisect: Automates the isolation of bugs by running targeted test scripts (e.g., yarn test) across commit ranges to identify the exact introduction point of a defect.

• Selective Commit Management: Offers safe cherry-pick procedures for backporting fixes or porting features across branches without corrupting history.

• Conflict Resolution Protocols: Provides a structured approach to identifying and resolving complex merge conflicts, including binary files and rename operations.

• Safety Guardrails: Implements strict stop-the-line conditions to protect protected branches (dev/master) and prevent unauthorized history rewriting.

• Recovery Procedures: Includes deep-dive recovery options such as reflog usage, hard/soft resets, and abort sequences for failed rebases or cherry-picks.

• Always verify your current branch context and destination reference before executing rebase or push operations.

• Utilize 'force-with-lease' exclusively when working on your private feature branches to protect remote state.

• Prioritize running 'git status' and 'git diff' before final commit resolution to ensure no unintended code changes are included.

• When performing automated bisect, ensure your test command (e.g., npm test or yarn test) is idempotent and reliable to avoid false positives.

• Use this skill for any complex git manipulation requiring protection against overwriting collaborative work or breaking project build integrity.