laurigates/git-resolve-conflicts
git-plugin/skills/git-resolve-conflicts/SKILL.md
Resolve PR merge conflicts. Use when a PR has conflicts with its base branch, rebasing produces conflicts, or automated merges fail.
$ install --global
skillsauthnpx skillsauth add laurigates/claude-plugins git-resolve-conflictsInstall this skill globally with one command. Works with Claude Code, Cursor, and Windsurf.
Security Scan Results
3 of 9 scanners reported clean
Some scanners were skipped, did not run, or reported a non-clean status. Review each row below.
3
Scanners Passed
9
Scanners in report
Clean
TrivyContainer and dependency vulnerability scanner
95%
Clean
SemgrepStatic code analysis for vulnerabilities
95%
Clean
mcp-scan (Snyk)Model Context Protocol security validation
95%
Skipped
Snyk (dep)Open source security scanning
50%
Skipped
Socket.devSupply chain security analysis
50%
Skipped
VirusTotalMulti-engine malware detection
50%
Skipped
CrowdStrikeAdvanced threat intelligence
50%
Skipped
OSV-ScannerOpen Source Vulnerability database check
50%
Skipped
OWASP Dep-Check
50%
Last scanned: May 20, 2026, 8:20 AM154.1s1 file scanned
SKILL.md
- name:
- git-resolve-conflicts
- description:
- Resolve PR merge conflicts. Use when a PR has conflicts with its base branch, rebasing produces conflicts, or automated merges fail.
- allowed-tools:
- Bash(git status *), Bash(git diff *), Bash(git log *), Bash(git show *), Bash(git add *), Bash(git commit *), Bash(git push *), Bash(git merge *), Bash(git checkout *), Bash(git rebase *), Bash(gh pr *), Read, Edit, Grep, Glob, TodoWrite
- args:
- [pr-number] [--push]
- argument-hint:
- PR number to resolve conflicts for
- disable-model-invocation:
- true
- created:
- 2026-02-26
- modified:
- 2026-02-26
- reviewed:
- 2026-02-26
/git:resolve-conflicts
Resolve merge conflicts in pull requests automatically.
When to Use This Skill
| Use this skill when... | Use git-ops agent instead when... | |------------------------|-----------------------------------| | PR has merge conflicts with base branch | Complex multi-branch rebase workflows | | Automated merge failed due to conflicts | Cherry-pick conflicts across many commits | | Config files (JSON, YAML) diverged | Conflicts require deep business logic understanding | | Base branch updates caused conflicts | Interactive rebase with squash/fixup needed |
Context
- Current branch: !
git branch --show-current - Git status: !
git status --porcelain=v2 --branch - Conflicted files: !
git diff --name-only --diff-filter=U - Recent commits on current branch: !
git log --format='%h %s' --max-count=5
Parameters
Parse these from $ARGUMENTS:
$1: PR number (if not provided, detect from current branch)--push: Push resolved conflicts after committing
Execution
Execute this conflict resolution workflow:
Step 1: Identify the PR and conflicts
- If PR number provided, fetch PR details:
gh pr view <number> --json headRefName,baseRefName,mergeable - If no PR number, detect from current branch:
gh pr list --head $(git branch --show-current) --json number,baseRefName,mergeable - Check if conflicts exist (mergeable == "CONFLICTING")
Step 2: Set up the merge
- Fetch latest base branch:
git fetch origin <base-branch> - If not already in a conflicted merge state, start the merge:
git merge origin/<base-branch> --no-ff - If merge succeeds cleanly, report "No conflicts to resolve" and exit
Step 3: Resolve each conflicted file
For each file listed by git diff --name-only --diff-filter=U:
- Read the file to see conflict markers (
<<<<<<<,=======,>>>>>>>) - Understand both sides:
- HEAD: Changes from the PR branch (the feature work)
- Incoming: Changes from the base branch (landed since PR opened)
- Apply resolution strategy based on file type:
| File Type | Strategy | |-----------|----------| | JSON config (package.json, plugin.json, marketplace.json) | Merge objects/arrays, take higher versions | | YAML config | Merge keys from both sides | | Markdown (CHANGELOG, README) | Include content from both sides | | Source code | Integrate both changes preserving logic | | Lock files | Regenerate after resolving other conflicts |
- Edit the file to remove ALL conflict markers and combine changes
- Stage:
git add <file>
Step 4: Verify and commit
- Check no conflict markers remain: search resolved files for
<<<<<<< - Check git status is clean (no remaining unmerged paths)
- Commit:
git commit --no-edit - If
--pushflag provided:git push origin <branch>
Step 5: Report results
Comment on the PR with resolution summary:
gh pr comment <number> --body "Merge conflicts with <base-branch> resolved automatically.
Resolved files:
- file1.json (merged entries from both sides)
- file2.md (combined changelog entries)
"
Conflict Resolution Patterns
JSON Files (marketplace.json, plugin.json, release-please configs)
- Merge array entries from both sides, deduplicate
- For version fields, take the higher version
- For object properties, include properties from both sides
Markdown Files (CHANGELOG, README)
- Include content from both sides
- For changelogs, maintain chronological order
- For tables, include rows from both sides
Source Code
- Read surrounding context to understand intent of both changes
- Integrate both modifications, preserving the logic of each
- If changes are to the same line with incompatible intent, prefer the PR branch change and note in the commit
When to Abort
Abort with git merge --abort if:
- Conflicts require understanding business requirements to resolve
- Both sides made fundamentally incompatible architectural changes
- Lock files are the only conflicts (suggest
--pushafter regenerating)
Agentic Optimizations
| Context | Command |
|---------|---------|
| List conflicts | git diff --name-only --diff-filter=U |
| Conflict details | git diff --diff-filter=U |
| PR mergeable state | gh pr view N --json mergeable |
| Check markers remain | grep -rn '<<<<<<<' <files> |
| Porcelain status | git status --porcelain=v2 |
Related Skills
laurigates/workflow-verify-before-filing
testing
VerifiedTrustedCommunity
Verify accumulated bug claims at upstream HEAD and dedup against trackers before filing issues. Use when filing upstream reports from backlogs, audit docs, or git-history findings.
38SKILL.mdUpdated Jun 12, 2026
laurigates/cold-read-gate
documentation
VerifiedTrustedCommunity
Gate outward-bound text (upstream issues, docs, PR bodies) through isolated haiku fresh-reader critique before publishing. Use when an artifact must survive a reader with zero project context.
38SKILL.mdUpdated Jun 12, 2026
laurigates/evaluate-improve
tools
VerifiedTrustedCommunity
Suggest improvements to SKILL.md content, descriptions, or tool config from eval results. Use when raising pass rates, fixing triggering, or iterating on a skill after evaluation.
38SKILL.mdUpdated Apr 16, 2026
laurigates/deadbranch
tools
VerifiedTrustedCommunity
deadbranch CLI for stale-branch cleanup — dry-run preview, TUI or non-interactive delete, protects main/develop/WIP. Use when asked to clean up branches, prune branches, or remove stale branches.
37SKILL.mdUpdated Jun 11, 2026