skills.rest
coopermayne
coopermayneCOMMUNITY
Explore all skills by this author →
GitHub

integrate

Merge remote feature branches into main with rebasing and conflict resolution.

1|Updated Jan 20, 2026
Search Tags:#git#workflow#rebasing#branch-merge#main
One-click install
npx skills add https://github.com/coopermayne/mcp-galipo --skill integrate-coopermayne
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: integrate
Source: https://github.com/coopermayne/mcp-galipo/tree/main/.claude/skills/integrate
Command: npx skills add https://github.com/coopermayne/mcp-galipo --skill integrate-coopermayne

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This skill merges remote feature branches into the main branch based on remote state.

Core Features & Use Cases

  • Remote branch discovery: Lists feature branches on origin and reports commit counts and file changes to inform merge order.
  • Controlled, one-branch-at-a-time merges: Rebases each feature branch onto the latest main before merging, minimizing conflicts.
  • Conflict-aware workflow: Stops on conflicts and requires user resolution before proceeding, ensuring a clean history.
  • Manual review & push control: Does not push changes automatically; requires explicit user confirmation to push results to main.

Quick Start

In your galipo repository, run the integrate skill and answer prompts to select branches and merge order.

  • Fetch remote branches with: git fetch origin --prune
  • Review branch sizes and choose the merge order as guided by the tool
  • For each selected branch, rebase onto latest main, resolve conflicts if any, then push only after manual confirmation

Frequently Asked Questions about integrate

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

FAQPage Schema
How do I safely merge remote feature branches into the main branch?▼

To safely merge remote feature branches into main, fetch origin branches, review their commit counts and file changes, then rebase each branch onto the latest main one at a time before merging.

What is the best way to rebase multiple branches before a branch merge?▼

The best way to rebase multiple branches is to merge one branch at a time, rebasing each selected feature branch onto the latest main to minimize conflicts and ensure a clean commit history.

How do I handle git conflicts when rebasing feature branches onto main?▼

When rebasing feature branches onto main, the workflow stops immediately upon detecting conflicts and requires manual conflict resolution before proceeding to the next branch.

Does this branch merge workflow push changes to main automatically?▼

No, this branch merge workflow does not push changes automatically. It requires explicit user confirmation to push the merged results to main, ensuring manual review and non-destructive control.

What do I need to set up before merging remote git branches?▼

Before merging remote git branches, you need a clean local working directory, a valid repository context, and must fetch origin with prune to discover feature branches and inform the merge order.

Related Skills

Explore More Software Engineering Skills→
mvillmowmvillmow
18

worktree-sync

Syncs Git worktrees by fetching remote and rebasing or merging main into feature branches.

Community
Basic
adamfilliadamfilli
11

rebase

Rebase the current Git branch onto the latest origin/main branch.

Community
Intermediate
aaronbassettaaronbassett
4

worktrees:finish

Finalize git worktrees via PR or direct merge and clean up branches.

Community
Advanced
zhaozengqing4364-bitzhaozengqing4364-bit

pull

Merges origin/main into current branch and resolves conflicts.

Community
Intermediate