skills.rest
cloudflare
cloudflareOFFICIAL
Explore all skills by this author →
WebsiteGitHub

rebase-conflict

Resolves merge conflicts between pull requests and production changes in documentation repositories.

5.2k|16.5k|Updated Sep 3, 2020
Search Tags:#merge conflict#conflict resolution#mdx#Documentation#gitHub#git rebase#Pull request
One-click install
npx skills add https://github.com/cloudflare/cloudflare-docs --skill rebase-conflict
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: rebase-conflict
Source: https://github.com/cloudflare/cloudflare-docs/tree/main/.flue/.agents/skills/rebase-conflict
Command: npx skills add https://github.com/cloudflare/cloudflare-docs --skill rebase-conflict

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Rebasing a pull request against a fast-moving production branch often produces merge conflicts that require understanding both sides' intent. This Skill automates that resolution by analyzing the PR's purpose and the production commits' rationale, then producing merged file content.

Core Features & Use Cases

  • Intent-Aware Conflict Resolution: Reads the PR title, description, and production commit PRs to understand why each side changed before merging.
  • Three-Way File Analysis: Compares merge-base, PR-head, and production-head versions of each conflicting file, including rename and deletion cases.
  • Confidence-Gated Output: Returns resolved files only when confidence is high; flags ambiguous cases as medium or low for human review.
  • Use Case: A documentation PR conflicts with production changes to the same MDX file. The Skill looks up the production PR that caused the conflict, merges both edits into valid MDX, and returns the resolved content with a confidence rating.

Quick Start

Resolve the merge conflicts for this pull request using the provided PR metadata, commit SHAs, and conflict file versions, then return the merged files with a confidence assessment.

Frequently Asked Questions about rebase-conflict

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

FAQPage Schema
How do I resolve merge conflicts in a pull request automatically?▼

Provide the PR title, description, head SHA, merge-base SHA, production head SHA, and the conflicting file versions. The Skill analyzes both sides' intent using commit PR lookups and returns merged file content with a confidence level.

How does the Skill decide which side of a conflict to keep?▼

It reads the PR description for the PR's intent and calls get_commit_pr on each production commit to learn why production changed. It then merges both changes so the PR's goal is preserved while incorporating production updates.

Can it handle rename or deleted file conflicts?▼

Yes. Conflict entries include a writePath for renames and null versions for deletions on either side. The Skill accounts for renameNote metadata and maps resolved content to the correct destination path.

What happens when conflict resolution is ambiguous?▼

The Skill assigns a medium or low confidence rating and returns an empty files array with an explanation. Only high-confidence resolutions include resolved file content, leaving ambiguous cases for human review.

Does it work with file formats other than MDX or Markdown?▼

The Skill is designed for the cloudflare-docs repository and targets valid, well-formed MDX/Markdown output matching repository style. It is not intended for resolving conflicts in source code or binary files.

Related Skills

Explore More Software Engineering Skills→
dobrinz123dobrinz123

gsd-reapply-patches

Reapply local modifications to restored GSD files via three-way merge.

Community
Advanced
JacobPEvansJacobPEvans
3

rebase-pr

Rebase pull requests onto main with signed commits and GitHub API checks.

Community
Advanced
edri2oredri2or

doc-standard

Audit Markdown files against a project style guide and propose fixes.

Official
Advanced
diShine-digital-agencydiShine-digital-agency
1

shine-reapply-patches

Merge saved user-local patches back into updated SHINE installations.

Community
Advanced