skills.rest
ryanportfolio
ryanportfolioCOMMUNITY
Explore all skills by this author →
WebsiteGitHub

merge

Automates session-wide commit, push, pull request, and squash-merge cycles into main.

Updated Aug 30, 2026
Search Tags:#automation#git#pull request#github#merge#conflict resolution#squash merge
One-click install
npx skills add https://github.com/ryanportfolio/threejs-interview-test --skill merge-ryanportfolio
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: merge
Source: https://github.com/ryanportfolio/threejs-interview-test/tree/main/.claude/skills/merge
Command: npx skills add https://github.com/ryanportfolio/threejs-interview-test --skill merge-ryanportfolio

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? Manually committing, pushing, opening pull requests, resolving conflicts, and merging into main after every completed task is repetitive and error-prone, especially when multiple sessions land work on a fast-moving main branch. ## Core Features & Use Cases - Session-Wide Auto-Merge Mode: Once activated, every completed and verified task is automatically committed, pushed, and merged into main via a squash-merged pull request without per-merge confirmation. - PR Reuse and Conflict Handling: Reuses the existing open PR for the session branch, syncs with origin/main, and resolves only unambiguous conflicts while stopping to ask on semantic ones. - Post-Squash Re-Sync: After each squash merge, merges origin/main back into the session branch to prevent phantom conflicts and replayed work in subsequent PRs. - Use Case: During a long coding session with frequent task completions, enable the mode once so each finished change lands on main through a verified PR cycle while respecting branch protection and required checks. ## Quick Start Ask the AI to enable auto-merge mode for this session so every completed task is committed, pushed, and squash-merged into main automatically.

Frequently Asked Questions about merge

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

FAQPage Schema
How do I automatically merge every completed task into main?▼

Enable auto-merge mode once per session; from then on each completed and verified task is committed, pushed, and merged into main through a squash-merged pull request without further confirmation. Saying stop merge turns the mode off.

How to squash merge a pull request with GitHub CLI?▼

Run gh pr merge <number> --squash to collapse the PR's commits into one commit on main. Many repositories allow only squash merging, and merge or rebase methods fail with GraphQL errors when disabled.

Why does my branch show conflicts after a squash merge?▼

A squash merge creates a new commit on main whose parents exclude the branch's commits, leaving the branch divergent. Fetch origin and merge origin/main back into the branch before starting the next task to avoid phantom conflicts.

Can auto-merge bypass branch protection or failing checks?▼

No. The workflow never uses --admin and stops when required checks or protection rules block the merge, reporting the exact gh output instead of forcing the merge.

What happens when merge conflicts are ambiguous?▼

Only unambiguous conflicts are resolved automatically. When both sides changed the same logic and the correct resolution is a judgment call, the cycle stops, reports the conflicted hunks, and asks before committing.

Related Skills

Explore More Software Engineering Skills→
bidahbidah
28

executing-plans

Executes approved plans with tracked tasks and verification checkpoints.

Community
Advanced
intrusive-memoryintrusive-memory
5

ship-swift-library

Automate Swift library releases by merging PRs, bumping versions, and publishing GitHub releases.

Official
Advanced
chainloop-devchainloop-dev
583

dependabot-pr-automation

Reviews, risk-assesses, approves, and merges open Dependabot pull requests on GitHub.

Official
Intermediate
SeleznovIvanSeleznovIvan
1

git-workflow

Manage Git merges, rebases, and commit history across branches.

Community
Intermediate