Guide Git branching, rebasing, and conflict resolution workflows.
npx skills add https://github.com/librefang/librefang-registry --skill git-expert-librefang
Please help me install this Agent Skill. Skill: git-expert Source: https://github.com/librefang/librefang-registry/tree/main/skills/git-expert Command: npx skills add https://github.com/librefang/librefang-registry --skill git-expert-librefang
Git workflows often derail teams due to poor branching strategies, unsafe merges, and difficult conflict resolution on shared repositories.
Ask the AI to implement a safe feature-branch workflow with a clear merge strategy in your repository.
High-intent search queries and answers about installing and using this skill.
The best way to resolve git merge conflicts on a shared repository involves step-by-step conflict handling using diff and merge tooling, alongside recovery techniques like reflog, stash, and rerere to safely manage and undo changes.
You can safely rewrite git history with interactive rebasing by following safe-force guidance using --force-with-lease, ensuring non-shared branches maintain a clean, linear, and auditable history without overwriting remote changes.
Your team can choose between trunk-based, Git Flow, and GitHub Flow branching models depending on your release cadence, applying clear naming conventions to maintain an auditable history across releases.
You recover lost commits after a bad git rebase by using the git reflog to find the previous HEAD state and resetting to it, utilizing stash and rerere configurations for comprehensive recovery.
You should use force push on a remote branch only on non-shared branches using --force-with-lease, preventing the accidental overwriting of collaborators' work while maintaining a linear history.
Tx1207Create a new project from a template, initialize uv, and configure a local Git repository.
chf3198Validate GitHub pull request approvals, status checks, and merge readiness.
takemi-ohamaMerge the latest default branch into the current working branch.
EmmraanManage Git repositories with branching strategies, commit conventions, and CI/CD integration.
