Automate git merging, rebasing, and conflict resolution with safety blocks.
npx skills add https://github.com/ek33450505/claude-agent-team --skill merge-ek33450505
Please help me install this Agent Skill. Skill: merge Source: https://github.com/ek33450505/claude-agent-team/tree/main/skills/merge Command: npx skills add https://github.com/ek33450505/claude-agent-team --skill merge-ek33450505
Developers waste time juggling git merges, rebases, and conflict resolution across multiple branches. This skill centralizes these operations into a safe, auditable workflow that reduces manual errors and keeps history clean.
Run /merge feature/my-branch to merge into main and let the agent orchestrate the full workflow.
High-intent search queries and answers about installing and using this skill.
Automate git merge and conflict resolution by dispatching an agent that detects merge scenarios and selects appropriate strategies like fast-forward, merge-commit, or squash. It provides built-in conflict-resolution guidance with safety rails to reduce manual errors.
Rebase mainline branches safely by dispatching a merge agent with full task context, enforcing safety rules like hard-blocks for force-merges and outputting diffs before execution. This centralized workflow keeps history clean and reduces manual errors.
Yes, you can merge pull requests via the gh CLI. The workflow automatically detects PR merge scenarios and orchestrates the full integration process, dispatching the merge agent to execute the PR merge safely with full context.
Yes, the git merge workflow enforces safety rules including hard-blocks for force-merges. It outputs diffs before execution and provides conflict-resolution guidance with safety rails, ensuring operations are safe and auditable.
Clean up stale branches and orphaned worktrees using built-in cleanup utilities. After completing git merges or rebases, these utilities remove stale branches and orphaned worktrees to keep repositories tidy and maintain a clean working environment.
DaddyElonMusk69Configure GitHub authentication for git operations and API access.
IJHackExecute QtPass unit and integration tests and generate coverage reports.
ByronWilliamsCPAGenerate Markdown pull request descriptions from git context with conventional titles.
chiptoe-svgDetect and merge upstream updates for git branch-distributed skills.
