skills.rest
Borda
BordaCOMMUNITY
Explore all skills by this author →
GitHub

resolve

Resolve merge conflicts and process review comments for GitHub Pull Requests.

24|3|Updated Feb 22, 2026
Search Tags:#automation#git#code review#pull request#github#merge conflict
One-click install
npx skills add https://github.com/Borda/.home --skill resolve-borda
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: resolve
Source: https://github.com/Borda/.home/tree/main/.claude/skills/resolve
Command: npx skills add https://github.com/Borda/.home --skill resolve-borda

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill automates the resolution of merge conflicts in Pull Requests and processes review comments, streamlining the code integration process.

Core Features & Use Cases

  • Automatic Conflict Resolution: Intelligently resolves merge conflicts by understanding source branch intent and target branch drift.
  • Review Comment Processing: Dispatches actionable review comments to an AI model for code updates.
  • Use Case: When a Pull Request has merge conflicts, this Skill can automatically resolve them and then apply the feedback from code reviewers, preparing the PR for merging.

Quick Start

Use the resolve skill to resolve conflicts and process review comments for Pull Request number 123.

Frequently Asked Questions about resolve

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I automatically resolve merge conflicts in a GitHub Pull Request?▼

To resolve merge conflicts in a GitHub Pull Request automatically, this Skill detects conflicts and intelligently merges them by understanding source branch intent and target branch drift using Git and AI assistance.

What tools are required to resolve PR conflicts and process review comments?▼

Resolving PR conflicts and processing review comments requires Git, GitHub CLI, and an AI coding tool (Codex) to be installed and accessible in your environment for automated code modification.

Can I use AI to process GitHub code review comments and update my code?▼

Yes, you can use AI to process GitHub code review comments. This Skill dispatches actionable review comments to an AI model, which then generates and applies the necessary code updates to prepare the PR.

What is the best way to handle both merge conflict resolution and code review feedback?▼

The best way to handle merge conflict resolution and code review feedback is to automate both sequentially. This Skill first intelligently resolves Git merge conflicts, then processes and applies reviewer comments to prepare the PR for merging.

Does automatic conflict resolution work with standard Git and GitHub CLI workflows?▼

Yes, automatic conflict resolution works with standard Git and GitHub CLI workflows. The Skill integrates directly with Git and GitHub CLI to detect Pull Request conflicts and dispatch review comments for AI-driven code updates.

Related Skills

Explore More Software Engineering Skills→
tile-aitile-ai
346

tilelang-github-operations

Install GitHub CLI and create pull requests via authenticated workflows.

Official
Advanced
jimmymalhanjimmymalhan
1

rebase-manager

Rebase dependent pull request branches onto main after a base PR merges.

Community
Intermediate
Asymmetric-alAsymmetric-al
417

lint-and-validate

Lint and validate Node.js, TypeScript, and Python code for syntax and standards.

Official
Intermediate
kaiohenricunhakaiohenricunha

review-pr

Automate GitHub pull request review, fix application, and validation workflows.

Community
Advanced