skills.rest
cychen2021
cychen2021COMMUNITY
Explore all skills by this author →
Website𝕏@cychen2022GitHub

merge-pr

Merge pull requests into main with merge commits and conflict resolution.

Updated Aug 23, 2026
Search Tags:#automation#git#verification#merge#pull-requests#conflicts
One-click install
npx skills add https://github.com/cychen2021/claude-skills --skill merge-pr-cychen2021
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: merge-pr
Source: https://github.com/cychen2021/claude-skills/tree/main/merge-pr
Command: npx skills add https://github.com/cychen2021/claude-skills --skill merge-pr-cychen2021

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Merge conflicts and PR integration can be error-prone and time-consuming; this skill provides a robust workflow to merge pull requests into the main branch using merge commits, with interactive conflict resolution and comprehensive post-merge checks.

Core Features & Use Cases

  • End-to-end PR merge with explicit merge commits (--no-ff) to preserve history
  • Interactive conflict resolution with guided decision-making
  • Post-merge verification including tests, build, and clippy
  • Automatic formatting after merge to ensure consistency
  • Use cases: finishing a feature branch merge, merging a PR with verification, or auto-detecting the current branch

Quick Start

Provide a PR number or branch name to initiate a complete, verified merge into main.

Frequently Asked Questions about merge-pr

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

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

To resolve merge conflicts safely, this skill automates merging pull requests into the main branch using interactive conflict resolution, guiding your decision-making process to ensure correct integration.

How do I merge a feature branch into main with an explicit merge commit?▼

You can merge a feature branch into main with an explicit merge commit by providing the branch name or PR number, which triggers a --no-ff merge to preserve your project's history.

Can I run tests and clippy verification automatically after merging a PR?▼

Yes, you can run tests and clippy verification automatically after merging a PR, as the skill performs comprehensive post-merge checks including build, clippy, and automatic formatting.

What's the best way to auto-detect and finish merging the current git branch?▼

The best way to auto-detect and finish merging the current git branch is to use this skill's manual activation feature, which automatically identifies your feature branch and completes the merge.

Does this PR merge workflow apply formatting after the merge is complete?▼

Yes, this PR merge workflow applies automatic formatting after the merge is complete, ensuring code consistency alongside its comprehensive post-merge tests, build, and clippy verifications.

Related Skills

Explore More Software Engineering Skills→
CapplequoppeCapplequoppe

merge-completed-work-github

Create GitHub pull requests merging completed work branches into parent branches.

Community
Advanced
pmcfadinpmcfadin
17

CI/CD Validation & Merge Workflow

Automate pre-push validation and merge workflows for the cqlite project.

Community
Advanced
marcusmarcus
1.0k

merge-strategy

Configure and apply git merge strategies for Sidecar workflows.

Community
Advanced
chiptoe-svgchiptoe-svg

update-skills

Detect and merge upstream updates for git branch-distributed skills.

Community
Intermediate