Guide Git workflows, conflict resolution, and repository management with standard commands.
npx skills add https://github.com/cin12211/orca-q --skill git-expert-cin12211
Please help me install this Agent Skill. Skill: git-expert Source: https://github.com/cin12211/orca-q/tree/main/.agent/skills/git-expert Command: npx skills add https://github.com/cin12211/orca-q --skill git-expert-cin12211
This Skill helps developers tackle complex Git workflows, resolve conflicts confidently, and manage repository history with best practices.
Propose a merge strategy for the current feature branch and outline a clean rebase plan.
High-intent search queries and answers about installing and using this skill.
To resolve Git merge conflicts, use a three-way merge strategy to compare the common ancestor, source, and target branches, allowing you to manually reconcile differences and minimize downtime during feature integration.
The best branching strategy for scaling teams depends on your workflow, with options like GitFlow, GitHub Flow, or trunk-based development providing structured patterns for release management, parallel development, and continuous integration.
To clean up repository history safely, use standard Git commands for history rewrite and recovery while adapting to your environment constraints, ensuring you back up uncommitted changes and coordinate with remote collaborators before force pushing.
Yes, you can manage remote collaboration using standard Git commands and best practices, which handle remote repository synchronization, branch tracking, and pull request workflows across common development scenarios.
Choose rebase over a standard merge commit to maintain a linear project history, applying your local commits on top of the target branch, while a merge commit preserves the exact historical context of parallel branch development.
SantiagoisperDetect and remove local Git branches absent from the remote.
kv0906Stage all changes, generate commit messages, and push to the remote repository.
alexandersumerGuide resolution of merge conflicts while preserving branch intent.
icartshResolve merge conflicts and rewrite Git history with interactive rebasing.
