skills.rest
drn
drnCOMMUNITY
Explore all skills by this author →
WebsiteGitHub

merge

Merge the current Git branch into master via GitHub Pull Request.

23|4|Updated Sep 5, 2013
Search Tags:#automation#git#code review#pull request#github#merge
One-click install
npx skills add https://github.com/drn/dots --skill merge-drn
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: merge
Source: https://github.com/drn/dots/tree/main/agents/skills/merge
Command: npx skills add https://github.com/drn/dots --skill merge-drn

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) components.

What problem does it solve?

This Skill automates the process of merging a feature branch into the master branch, including creating a GitHub Pull Request if one doesn't exist, and handling potential merge conflicts.

Core Features & Use Cases

  • Automated PR Creation/Update: Creates a new GitHub PR or updates an existing one for the current branch.
  • Conflict Resolution: Guides the user through resolving rebase conflicts if they occur.
  • Smart Merging: Attempts squash merges, admin merges, and auto-merges based on PR status and repository settings.
  • Use Case: After completing work on a feature branch, use this Skill to seamlessly merge it into the main development line, ensuring all necessary checks and updates are performed.

Quick Start

Use the merge skill to merge the current branch into master with the title "feat: Implement user authentication" and body "Adds user login and registration functionality.".

Frequently Asked Questions about merge

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

FAQPage Schema
How do I automate merging a Git branch into master via a GitHub Pull Request?▼

To automate merging a Git branch into master, this Skill creates or updates a GitHub Pull Request using the `gh` CLI, pushes the branch, and attempts various merge strategies to finalize the integration.

What is the best way to handle rebase conflicts when merging a feature branch?▼

Handling rebase conflicts during a branch merge is managed by this Skill, which guides users through the conflict resolution process before attempting to push the branch and complete the GitHub Pull Request merge.

Does this GitHub merge automation support squash merges and auto-merge strategies?▼

Yes, this GitHub merge automation supports squash merges, admin merges, and auto-merges, dynamically attempting these strategies based on the specific Pull Request status and repository settings.

Do I need the `gh` CLI installed to automate Git pull request merges?▼

Yes, you need the `gh` CLI installed to automate Git pull request merges, as it is required for all GitHub interactions, alongside Git for handling local version control operations and branch rebasing.

How can I create a GitHub PR with a specific title and body description from the command line?▼

You can create a GitHub PR with a specific title and body description by triggering this Skill, which automatically generates or updates the Pull Request for your current branch with the provided text inputs.

Why does my automated branch merge fail when repository checks are pending?▼

An automated branch merge may fail if repository checks are pending or blocked, though this Skill attempts to bypass standard restrictions by utilizing admin merges and auto-merge strategies when permitted.

Related Skills

Explore More Software Engineering Skills→
gelowzzzgelowzzz

ship-it

Push the current Git branch to GitHub and open a pull request with generated title and body.

Community
Intermediate
tachyon-beeptachyon-beep
14

cicd-pipeline-architecture

Architect CI/CD pipelines with deployment strategies, test gates, and rollback mechanisms.

Community
Advanced
aberrantCodeaberrantCode
1

ship-to-dev

Merge feature branches into DEV after passing tests and coverage gates.

Community
Advanced
cegit27cegit27
3

land-and-deploy

Merge pull requests, wait for CI and deployment, and verify production health.

Official
Advanced