skills.rest
HomericIntelligence
HomericIntelligenceOFFICIAL
Explore all skills by this author โ†’
GitHub

pr-cleanup

Squash commits, rebase onto main, and verify CI status for GitHub pull requests.

18|5|Updated Nov 3, 2025
Search Tags:#git#pull request#github#cleanup#rebase#squash#ci
One-click install
npx skills add https://github.com/HomericIntelligence/ProjectOdyssey --skill pr-cleanup
Or copy as Structured Prompt for Agentโ–ผ
Please help me install this Agent Skill.
Skill: pr-cleanup
Source: https://github.com/HomericIntelligence/ProjectOdyssey/tree/main/.claude/skills/pr-cleanup
Command: npx skills add https://github.com/HomericIntelligence/ProjectOdyssey --skill pr-cleanup

SYSTEM DOCUMENTATION & REQUIREMENTS

๐Ÿ’ก This Skill includes references (resource) components.

What problem does it solve?

This Skill automates the final steps of preparing a pull request for merging, ensuring a clean commit history and adherence to project standards.

Core Features & Use Cases

  • Commit Management: Consolidates multiple commits into logical units via squashing or rebasing.
  • Conflict Resolution: Helps resolve merge conflicts with the main branch.
  • Pre-Merge Verification: Checks CI status and ensures all pre-merge requirements are met.
  • Use Case: After receiving feedback on a pull request and making changes, use this Skill to squash your commits, rebase onto the latest main branch, and verify that all automated checks are passing before requesting a final merge.

Quick Start

Use the pr-cleanup skill to prepare the current pull request for merging by squashing commits and rebasing onto main.

Frequently Asked Questions about pr-cleanup

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

FAQPage Schema
How do I squash commits and rebase a pull request before merging?โ–ผ

Squashing and rebasing a pull request consolidates multiple commits into logical units and aligns your branch with the latest main. This process ensures a clean commit history and verifies the pull request is merge-ready.

What is the best way to verify CI status before merging a GitHub pull request?โ–ผ

Verifying CI status before merging a GitHub pull request involves checking that all automated CI checks are passing and pre-merge requirements are met. This pre-merge verification ensures the pull request is ready for finalization.

How do I resolve merge conflicts with the main branch in my pull request?โ–ผ

Resolving merge conflicts with the main branch in your pull request involves identifying conflicting changes and aligning them with the target branch. This conflict resolution step is essential for making the pull request merge-ready.

When should I clean up my commit history for a pull request?โ–ผ

You should clean up your commit history for a pull request after receiving feedback and making changes. This final step before requesting a merge ensures commits are squashed into logical units and rebased onto main.

Does GitHub pull request cleanup support both squashing and rebasing workflows?โ–ผ

Yes, GitHub pull request cleanup supports both squashing and rebasing workflows for commit management. It consolidates multiple commits into logical units via squashing or rebasing to ensure adherence to project standards.

Why does my pull request fail pre-merge verification due to commit history?โ–ผ

Your pull request may fail pre-merge verification due to a messy commit history with fragmented commits. Cleaning up the history by squashing commits and rebasing onto the main branch resolves this and ensures merge readiness.

Related Skills

Explore More Software Engineering Skillsโ†’
7loro7loro
1

git-master

Organize multi-file Git changes into atomic commits with rebase and squash workflows.

Community
Advanced
cookeyholdercookeyholder

squash-pr

Squash and merge a GitHub pull request into main after validating review feedback.

Community
Advanced
chf3198chf3198

github-review-merge-admin

Validate GitHub pull request approvals, status checks, and merge readiness.

Community
Intermediate
markus41markus41
1

gitworfkflows

Manage Git branching, commits, rebasing, and pull requests.

Community
Basic