Guide users through resolving Git merge conflicts file by file.
npx skills add https://github.com/ahoym/dotfiles --skill git-resolve-conflicts
Please help me install this Agent Skill. Skill: git-resolve-conflicts Source: https://github.com/ahoym/dotfiles/tree/main/.claude/commands/git-resolve-conflicts Command: npx skills add https://github.com/ahoym/dotfiles --skill git-resolve-conflicts
This Skill helps developers efficiently resolve merge conflicts that arise during Git operations, ensuring smooth integration of code changes.
Use the git-resolve-conflicts skill to resolve merge conflicts for the current branch against its base.
High-intent search queries and answers about installing and using this skill.
To resolve Git merge conflicts, this Skill interactively guides you through identifying and fixing conflicts file by file, then helps you commit the resolution. It supports automatic base branch detection or lets you specify the base branch for merging.
Yes, you need Git and GitHub CLI installed to fix merge conflicts with this tool. The Skill requires these dependencies for fetching branch data, merging code, and checking PR status during the interactive resolution process.
The best way to handle code integration conflicts is using an interactive guide that systematically addresses each conflict file by file. This ensures you choose the correct code changes and smoothly commit the resolution into the base branch.
Yes, you can specify a custom base branch when resolving version control conflicts. The Skill allows manual specification of the base branch for merging, or it can automatically detect the appropriate base branch for your current repository state.
Automatic base branch detection matters for resolving GitHub merge conflicts because it streamlines the process by identifying the correct target branch without manual input. This reduces errors when fetching and merging code changes across multiple feature branches.
CapplequoppeResolve GitHub pull request review comments by fetching PR details, checking out branches, and pushing updates.
CodySwannGTCommits changes, submits a pull request, and monitors it for approval and passing checks.
0xRayAIStandardize source code formatting and enforce style consistency across project files.
ksciusResolve Git merge conflicts and verify buildable, test-passing state.
