Resolve Git conflicts and branching issues with reversible step-by-step guidance.
npx skills add https://github.com/0xkynz/codekit --skill git-expert-0xkynz
Please help me install this Agent Skill. Skill: git-expert Source: https://github.com/0xkynz/codekit/tree/main/templates/skills/git-expert Command: npx skills add https://github.com/0xkynz/codekit --skill git-expert-0xkynz
Git workflows are error-prone and hard to standardize across teams; this Skill provides guided, safe, and reversible Git strategies for conflicts, branching, and history management.
Describe your current Git state and request a safe, reversible plan to resolve conflicts.
High-intent search queries and answers about installing and using this skill.
Resolve git merge conflicts using three-way awareness and safe handoffs to ensure no changes are lost. This approach provides step-by-step instructions and traceable reversions for predictable conflict resolution outcomes.
Rewrite git history through interactive rebase with safe, reversible guidance and safety checks. This method ensures clean histories and recoverable operations across your repositories using reflog for traceable reversions.
Choose a branching strategy by evaluating GitFlow, GitHub Flow, and trunk-based development. This guidance applies to team workflows requiring sustainable merge strategies and clean histories across individual projects.
Recover lost commits after a bad git reset or rebase using reflog and history management operations. This provides safe, reversible recovery with step-by-step instructions and safety checks for predictable outcomes.
You should not use git rebase when working with shared branch histories where traceable reversions are required. Instead, use safe merge strategies to ensure predictable outcomes and avoid history rewrite complications.
utekManage code changes and repository history with Git commands.
AtaraxiaEpiphanyScaffold standardized project structures with workflow files and testing strategies.
vasilyu1983Design Git branching strategies, PR workflows, and release automation.
julianobarbosaExecute advanced Git workflows including rebasing, cherry-picking, bisecting, and worktrees.
