Is it compatible with git worktrees?

Yes, it is specifically designed to work within git worktree structures, allowing you to sync your main worktree and rebase feature branches efficiently.

What are the requirements for merging a PR?

The pull request must be open, mergeable with no existing conflicts, have all CI checks passing, all review threads resolved, and have an official 'Approved' status.

How does it manage local branches after merging?

Once the rebase and push to origin/main are successful, the skill automatically deletes the local feature branch and the remote branch, and prunes the associated worktree.

Does this skill handle merge conflicts?

Yes, the skill identifies conflicted files and provides an intelligent resolution process. If conflicts are too complex for automated resolution, it provides clear instructions for manual intervention.

Why use this instead of the GitHub merge button?

GitHub's web and CLI merge tools typically do not sign the merge commit. This workflow uses local git operations to preserve your GPG or SSH signatures, which is required for many secure repositories.

Git Rebase PR Workflow

Name: Git Rebase PR Workflow
Author: JacobPEvans

byJacobPEvans

開発者ツール

Automates local git rebase-merge workflows for pull requests to maintain linear history and cryptographically signed commits.

概要

This skill provides a robust, local-first workflow for merging pull requests by rebasing them onto the main branch, ensuring a clean linear history while preserving GPG/SSH commit signatures—a critical feature often lost when using GitHub's standard web UI or CLI merge tools. It enforces strict safety protocols by validating CI status, review approvals, and resolved threads before execution, and handles complex git worktree structures to ensure a seamless transition from feature development to production-ready main branches.

主な機能

Automated PR readiness validation including CI checks and review status
Maintains clean linear git history by avoiding merge commits
Automated cleanup of local worktrees and remote feature branches
0 GitHub stars
Intelligent conflict detection and resolution guidance
Preserves commit signatures throughout the entire merge process

ユースケース

Automating the manual rebase-and-push sequence with built-in safety checks
Merging pull requests in repositories with strict commit signing policies
Maintaining a high-quality, linear git log for large-scale projects

概要

主な機能

Automated PR readiness validation including CI checks and review status
Maintains clean linear git history by avoiding merge commits
Automated cleanup of local worktrees and remote feature branches
0 GitHub stars
Intelligent conflict detection and resolution guidance
Preserves commit signatures throughout the entire merge process

ユースケース

Automating the manual rebase-and-push sequence with built-in safety checks
Merging pull requests in repositories with strict commit signing policies
Maintaining a high-quality, linear git log for large-scale projects