skills.rest
pkuppens
pkuppensCOMMUNITY
Explore all skills by this author →
WebsiteGitHub

integration-merge

Merge approved pull requests into main and delete source branches.

Updated Jan 5, 2025
Search Tags:#automation#git#workflow#merge#pull-request#branch-cleanup#pr-merge
One-click install
npx skills add https://github.com/pkuppens/pkuppens --skill integration-merge
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: integration-merge
Source: https://github.com/pkuppens/pkuppens/tree/main/skills/integration/integration-merge
Command: npx skills add https://github.com/pkuppens/pkuppens --skill integration-merge

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Merges the PR into main and performs post-merge cleanup.

Core Features & Use Cases

  • Merge: merges the pull request into main following repository guidelines.
  • Cleanup: deletes the source branch after merge or per policy.
  • Local sync: updates local main and ensures the working tree is clean.
  • Conflict handling: provides guidance for resolving conflicts during merge.
  • Integration flow: runs after integration-pr and can reference maintenance-cleanup for branch pruning.

Quick Start

Tell the Skill to merge PR <number> using the preferred strategy and perform post-merge cleanup.

Frequently Asked Questions about integration-merge

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

FAQPage Schema
How do I automatically merge a pull request into main and delete the source branch?▼

To automatically merge a pull request into main and delete the source branch, use a workflow tool that applies the repository's preferred merge strategy and performs branch cleanup. It requires the PR to be approved and ready for integration.

What is the best way to handle branch cleanup after a PR merge?▼

The best way to handle branch cleanup after a PR merge is to automate the deletion of the source branch per repository policy. This ensures the working tree stays clean and updates local main to sync with the remote repository.

How do I resolve conflicts during an automated git merge into main?▼

To resolve conflicts during an automated git merge into main, the workflow provides guidance for resolving conflicts during the merge process. This helps you address integration issues while maintaining the repository's preferred merge strategy.

Do I need PR approval before automating the merge and cleanup workflow?▼

Yes, you need PR approval before automating the merge and cleanup workflow. The automated integration requires that the pull request has been approved and is fully ready for integration into the main branch.

Can I sync my local main branch automatically after a pull request merge?▼

Yes, you can sync your local main branch automatically after a pull request merge. The workflow updates local main and ensures the working tree is clean as part of the post-merge cleanup process.

When should I not use an automated PR merge strategy?▼

You should not use an automated PR merge strategy when the pull request has unresolved conflicts or has not yet been approved. The automation is designed for approved PRs that are ready for integration without manual intervention.

Related Skills

Explore More Software Engineering Skills→
fredericpoitevinfredericpoitevin

babysit

Triage PR comments, resolve conflicts, and stabilize CI until merge-ready.

Community
Intermediate
michaelvolzmichaelvolz

git-clean-gone-branches

Delete local Git branches whose remote tracking branches no longer exist.

Community
Intermediate
olioappsolioapps

pr-formatting

Generate structured pull request descriptions from commits with testing and deployment notes.

Official
Advanced
GamezarGamezar

git-merge-worktree

Merge Git worktree changes into the current branch with configurable strategies.

Community
Advanced