skills.rest
dmzoneill
dmzoneillCOMMUNITY
Explore all skills by this author →
WebsiteGitHub

rebase-pr

Rebase a Git pull request branch onto main with conflict resolution and linting.

2|Updated Feb 16, 2026
Search Tags:#automation#git#developer tools#rebase#conflict resolution#pr
One-click install
npx skills add https://github.com/dmzoneill/skills --skill rebase-pr-dmzoneill
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: rebase-pr
Source: https://github.com/dmzoneill/skills/tree/main/rebase-pr
Command: npx skills add https://github.com/dmzoneill/skills --skill rebase-pr-dmzoneill

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) and references (resource) components.

What problem does it solve?

This Skill automates the process of rebasing a Git pull request branch onto the main branch, handling merge commits, conflicts, linting, and force pushing.

Core Features & Use Cases

  • Automated Rebasing: Rebase your feature branch onto the latest main branch.
  • Conflict Resolution: Attempts to auto-resolve common merge conflicts.
  • Linting & Force Push: Optionally runs linters and force-pushes the rebased branch.
  • Use Case: When you need to update your long-running feature branch with the latest changes from main before merging, and want to avoid manual Git commands and potential conflicts.

Quick Start

Use the rebase-pr skill to rebase the current branch onto main and force push if there are no conflicts.

Frequently Asked Questions about rebase-pr

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

FAQPage Schema
How do I rebase a pull request branch onto the main branch without manual git commands?▼

Automated rebasing of your pull request branch onto main updates long-running feature branches with the latest changes, managing merge commits and attempting auto-resolution of common conflicts before force pushing.

Can I auto-resolve merge conflicts when rebasing a feature branch?▼

You can auto-resolve common merge conflicts during the rebase process, updating your feature branch with the latest main changes while avoiding manual conflict resolution.

Does the rebase process run linting checks before force pushing?▼

Linting checks are optionally executed during the rebase workflow, and conditional force pushes are performed to ensure your rebased branch passes validation before updating the remote pull request.

Does this rebasing workflow integrate with GitLab and Jira?▼

GitLab integration fetches merge request information and Jira integration resolves issue keys during the pull request rebase process, linking your rebased branch to existing project tracking data.

What is the best way to update a long-running feature branch with latest main changes?▼

Rebasing your long-running feature branch onto the latest main branch is the best way to sync changes, automatically handling merge commits, conflicts, and conditional force pushes to streamline integration.

Related Skills

Explore More Software Engineering Skills→
dmzoneilldmzoneill
2

close-issue

Transition Jira issues to Done and comment with commit and Merge Request summaries.

Community
Advanced
guardiatechnologyguardiatechnology

kata-stacked-pr-merge

Merge stacked pull requests bottom-to-top with CI and approval validation.

Official
Advanced
furrycolombia-sysfurrycolombia-sys
1

review-branch

Identify and patch discrepancies between the current branch and develop.

Community
Intermediate
cbleckercblecker
5

rebasing-branch

Rebase a feature branch onto an updated base branch with conflict guidance.

Community
Basic