git

To resolve Git conflicts, the Skill guides you step-by-step through applying changes across branches, explaining history clearly while enforcing safety checks. It assists in resolving both merge and rebase conflicts to ensure no work is lost.

The safest way to undo mistakes in version control is using guided stashing and reversion commands. The Skill requires explicit confirmation for destructive actions, ensuring you revert bad changes and save work without losing history.

You can rebase a feature branch and cherry-pick commits safely by applying changes across branches with built-in safety checks. The workflow enforces guidelines and requires explicit confirmation before executing destructive branch modifications.

You can inspect Git history to find when a bug was introduced by using history inspection commands to summarize changes. The Skill detects when something broke and presents commit history with clear explanations of what changed.

Yes, this Git workflow guidance works for managing both feature and release branches. It handles advanced operations like branch creation, renaming, deletion, and comparison across these branch types to maintain clean project history.

Rebasing goes wrong and causes lost work when destructive actions are performed without explicit confirmation. The Skill prevents this by enforcing strict safety guidelines during advanced branch management, ensuring you apply changes safely without messy histories.